mrrl

commit c2d9cb87b56409c43acb6c30ef78edefaebc2d1b
parent 2e1e7e24762c197db0b6649fea5b00c9dae04555
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue, 15 Apr 2025 00:27:51 +0000

Use current submodule head instead of commited for util/generate-and-commit

Diffstat:
M
util/build
 | 
4
+---
M
util/generate-and-commit
 | 
2
+-
M
util/generate-packages
 | 
8
++++++++
A
util/verify-generated-packages
 | 
4
++++

4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/util/build b/util/build
@@ -1,6 +1,4 @@
 #!/bin/sh -xe
 cd "$(dirname "$0")/.."
-
-./util/generate-packages
-make py-genpkgall
+env pthbs_genpkgpy_submodule_source=cached ./util/generate-packages
 exec make -rs "$@"
diff --git a/util/generate-and-commit b/util/generate-and-commit
@@ -1,6 +1,6 @@
 #!/bin/sh -xe
 cd "$(dirname "$0")/.."
-./util/generate-packages
+env pthbs_genpkgpy_submodule_source=current ./util/generate-packages
 git commit -a "$@"
 git push origin trunk
 ./util/submodules-update-branch
diff --git a/util/generate-packages b/util/generate-packages
@@ -1,6 +1,14 @@
 #!/bin/sh -xe
 cd "$(dirname "$0")/.."
 
+case "$pthbs_genpkgpy_submodule_source" in
+	(current|cached);;
+	(*)
+		printf '%s\n' >&2 "fatal: ${0##*/}: \$pthbs_genpkgpy_submodule_source is not defined"
+		exit 100
+		;;
+esac
+
 ./pthbs/util/gen-filelist-sha256 files/ >.new.filelist.sha256
 if ! cmp -s filelist.sha256 .new.filelist.sha256; then
 	mv .new.filelist.sha256 filelist.sha256
diff --git a/util/verify-generated-packages b/util/verify-generated-packages
@@ -0,0 +1,4 @@
+#!/bin/sh -xe
+cd "$(dirname "$0")/.."
+env pthbs_genpkgpy_submodule_source=cached ./util/generate-packages
+git status variants