linux-qubasis

commit 034038a3e50cdc35314d0a8766a1ff53607e5320
parent acc590ca73c2d4749fa460bfe8a5428c18b8a9e5
Author: Jul <jul@9o.is>
Date:   Tue, 18 Nov 2025 03:15:05 -0500

set build target to root.fspec

Diffstat:
R
pkg/files.sh -> pkg/gen-files.sh
 | 
0

M
pkg/gen.sh
 | 
2
+-
M
pkg/genfn.sh
 | 
2
+-
R
qubes/fspec.awk -> qubes/gen-fspec.awk
 | 
0

M
qubes/gen.sh
 | 
8
++++----
M
qubes/genfn.sh
 | 
5
+++--

6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/pkg/files.sh b/pkg/gen-files.sh
diff --git a/pkg/gen.sh b/pkg/gen.sh
@@ -68,7 +68,7 @@ bind description 'EXTRACT $in'
 rule patch 'git -C $srcdir am -3 --keep-non-patch --no-gpg-sign --whitespace=nowarn ../../../$in >/dev/null && touch $out'
 bind description 'PATCH $in'
 
-rule files 'sh ./pkg/files.sh $outdir $files >$out'
+rule files 'sh ./pkg/gen-files.sh $outdir $files >$out'
 bind description 'GEN $out'
 bind generator 1
 
diff --git a/pkg/genfn.sh b/pkg/genfn.sh
@@ -31,7 +31,7 @@ fini_pkg() {
 	fi
 
 	if [ "$FILE" ]; then
-		files files '|' ./pkg/files.sh $GEN_FILES
+		files files '|' ./pkg/gen-files.sh $GEN_FILES
 		bind files $FILE
 	fi
 }
diff --git a/qubes/fspec.awk b/qubes/gen-fspec.awk
diff --git a/qubes/gen.sh b/qubes/gen.sh
@@ -16,13 +16,13 @@ var pkgexclude
 rule touch 'touch $out'
 bind description 'TOUCH $out'
 
-rule fspec_hash 'cat $in | $hostdir/fspec-hash >$out'
-bind description 'FSPEC $out'
-
 rule fspec_tar '$hostdir/fspec-tar <$in | gzip -c -9 >$out'
 bind description 'TAR $out'
 
-rule fspec 'awk -f $qubesdir/fspec.awk $fspecvars $in >$out 2>/dev/null'
+rule fspec_hash 'cat $in | $hostdir/fspec-hash >$out'
+bind description 'FSPEC $out'
+
+rule fspec 'awk -f $qubesdir/gen-fspec.awk $fspecvars $in >$out 2>/dev/null'
 bind description 'FSPEC $out'
 bind fspecvars "
 	-v pkgexclude=$pkgexclude
diff --git a/qubes/genfn.sh b/qubes/genfn.sh
@@ -20,11 +20,12 @@ fini_qvm() {
 	if [ "$FSPECS" ]; then
 		fspec_hash root.fspec $FSPECS
 		fspec_tar root.tar.gz $outdir/root.fspec
+		phony build $outdir/root.fspec
 	else
-		touch root.tar.gz
+		touch nofspecs
+		phony build $outdir/nofspecs
 	fi
 
-	phony build $outdir/root.tar.gz
 }
 
 pkg() {