linux-qubasis

commit a0638cf87950023eb2e17e67e3bcd3ac142bd486
parent 50dd8f9fca40917098fb14349653fbfd9a44bc7b
Author: Jul <jul@9o.is>
Date:   Thu, 20 Nov 2025 10:54:25 -0500

restat root.fspec

Diffstat:
M
qubes/genfn.sh
 | 
2
+-
M
qubes/rules.sh
 | 
15
++++++++-------

2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/qubes/genfn.sh b/qubes/genfn.sh
@@ -21,7 +21,7 @@ fini_qvm() {
 	fi
 
 	if [ "$FSPECS" ]; then
-		fspec_hash root.fspec $FSPECS
+		fspec_root root.fspec $FSPECS
 		phony build $outdir/root.fspec
 	else
 		touch nofspecs
diff --git a/qubes/rules.sh b/qubes/rules.sh
@@ -1,13 +1,7 @@
 rule touch 'touch $out'
 bind description 'TOUCH $out'
 
-rule fspec_tar '$hostdir/fspec-tar <$in | gzip -c -9 >$out'
-bind description 'TAR $out'
-
-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'
+rule fspec 'awk -f $qubesdir/gen-fspec.awk $fspecvars $in | $hostdir/fspec-hash >$out 2>/dev/null'
 bind description 'FSPEC $out'
 bind fspecvars "
 	-v pkgexclude=$pkgexclude
@@ -22,6 +16,13 @@ bind fspecvars "
 	-v statedir=$statedir
 "
 
+rule fspec_root 'cat $in >$out.tmp && cmp -s $out.tmp $out || mv $out.tmp $out; rm -f $out.tmp'
+bind description 'FSPEC $out'
+bind restat 1
+
+rule fspec_tar '$hostdir/fspec-tar <$in | gzip -c -9 >$out'
+bind description 'TAR $out'
+
 rule qubes_policy 'qubes-policy --replace $policy <$in && touch $out'
 bind description 'QUBES POLICY $policy'