On Mon, Oct 21, 2024 at 11:58:28AM +0100, Richard W.M. Jones wrote: > Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025 > Signed-off-by: Richard W.M. Jones <rjo...@redhat.com> > --- > appliance/Makefile.am | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/appliance/Makefile.am b/appliance/Makefile.am > index 8cb9bd1fff..51d9498e12 100644 > --- a/appliance/Makefile.am > +++ b/appliance/Makefile.am > @@ -113,12 +113,17 @@ packagelist: packagelist.in Makefile guestfsd.deps > cmp -s $@ $@-t || mv $@-t $@ > rm -f $@-t > > +# Use stable times and owner/group (RHBZ#2320025). > +TAR_COMMAND := tar -z \ > + --owner=0 --group=0 \ > + $${SOURCE_DATE_EPOCH:+--mtime=@$$SOURCE_DATE_EPOCH} > + > supermin.d/daemon.tar.gz: ../daemon/guestfsd > rm -f $@ $@-t > rm -rf tmp-d > mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc > ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd > - ( cd tmp-d && tar zcf - * ) > $@-t > + ( cd tmp-d && $(TAR_COMMAND) -cf - * ) > $@-t
I see that '-z' was added in TAR_COMMAND, I thought it got got lost at first. LGTM. Zbyszek > rm -r tmp-d > mv $@-t $@ > > @@ -139,7 +144,7 @@ supermin.d/hostfiles: hostfiles.in Makefile > > supermin.d/init.tar.gz: init > rm -f $@ $@-t > - ( cd $(srcdir) && tar zcf - init ) > $@-t > + ( cd $(srcdir) && $(TAR_COMMAND) -cf - init ) > $@-t > mv $@-t $@ > > # We should put this file in /lib/udev/rules.d, but put it in /etc so > @@ -149,7 +154,7 @@ supermin.d/udev-rules.tar.gz: 99-guestfs-serial.rules > rm -rf tmp-u > mkdir -p tmp-u/etc/udev/rules.d > for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done > - ( cd tmp-u && tar zcf - etc ) > $@-t > + ( cd tmp-u && $(TAR_COMMAND) -cf - etc ) > $@-t > rm -r tmp-u > mv $@-t $@ > > -- > 2.46.0 > _______________________________________________ Libguestfs mailing list -- guestfs@lists.libguestfs.org To unsubscribe send an email to guestfs-le...@lists.libguestfs.org
