Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 17:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass --sort=name to tar to make tarballs more reproducible and rsync-friendly

Browse Source
This commit is contained in:
Balint Reczey 2019-03-19 12:32:25 +01:00
parent b952a0c243
commit 2d162dd121
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
live-build/auto/build
View File

@ -475,7 +475,7 @@ for ISO in binary.iso binary.hybrid.iso; do
done done
if [ -e "binary/$INITFS/filesystem.dir" ]; then if [ -e "binary/$INITFS/filesystem.dir" ]; then
(cd "binary/$INITFS/filesystem.dir/" && tar -c --xattrs *) | \ (cd "binary/$INITFS/filesystem.dir/" && tar -c --sort=name --xattrs *) | \
gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz" gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz"
chmod 644 "$PREFIX.rootfs.tar.gz" chmod 644 "$PREFIX.rootfs.tar.gz"
elif [ -e binary-tar.tar.gz ]; then elif [ -e binary-tar.tar.gz ]; then
@ -512,7 +512,7 @@ EOF
fi fi
if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
(cd "binary/$INITFS/custom.dir/" && tar -c --xattrs *) | \ (cd "binary/$INITFS/custom.dir/" && tar -c --sort=name --xattrs *) | \
gzip -9 --rsyncable > "$PREFIX.custom.tar.gz" gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
chmod 644 "$PREFIX.custom.tar.gz" chmod 644 "$PREFIX.custom.tar.gz"
fi fi
@ -649,7 +649,7 @@ case $PROJECT:${SUBPROJECT:-} in
raspi2) raspi2)
# ubuntu-device-flash does not like subdirs here, we need to tar it up # ubuntu-device-flash does not like subdirs here, we need to tar it up
if [ -e $TMPDIR/assets/dtbs/overlays ]; then if [ -e $TMPDIR/assets/dtbs/overlays ]; then
tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays tar --sort=name -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays
rm -rf $TMPDIR/assets/dtbs/overlays rm -rf $TMPDIR/assets/dtbs/overlays
fi fi
;; ;;
@ -698,7 +698,7 @@ EOF
manifestname="$devarch.$manifestname" manifestname="$devarch.$manifestname"
fi fi
# create tarfile # create tarfile
tar -c -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml tar -c --sort=name -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml
# create device specific manifest to track kernel dpkg version # create device specific manifest to track kernel dpkg version
cp assets/dpkg.list $HERE/$PREFIX.$manifestname cp assets/dpkg.list $HERE/$PREFIX.$manifestname

2
live-build/ubuntu-cpc/hooks.d/base/root-xz.binary
View File

@ -12,4 +12,4 @@ fi
rootfs_dir=rootfs.dir rootfs_dir=rootfs.dir
cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
(cd $rootfs_dir/ && tar -c --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz (cd $rootfs_dir/ && tar -c --sort=name --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz

1
live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
View File

@ -227,6 +227,7 @@ OVA information:
EOM EOM
tar -C ${box_d} \ tar -C ${box_d} \
--sort=name \
-cf ${cur_d}/livecd.ubuntu-cpc.vagrant.box \ -cf ${cur_d}/livecd.ubuntu-cpc.vagrant.box \
box.ovf \ box.ovf \
Vagrantfile \ Vagrantfile \

1
live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary
View File

@ -104,6 +104,7 @@ OVA information:
EOM EOM
tar -C ${scratch_d} \ tar -C ${scratch_d} \
--sort=name \
-cf ${cur_d}/livecd.ubuntu-cpc.ova \ -cf ${cur_d}/livecd.ubuntu-cpc.ova \
${prefix}.ovf \ ${prefix}.ovf \
${prefix}.mf \ ${prefix}.mf \

2
live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
View File

@ -62,7 +62,7 @@ fi
# and tar it up # and tar it up
( (
cd $TMPDIR cd $TMPDIR
tar -c -z -f $HERE/device.tar.gz system assets hardware.yaml tar -c --sort=name -z -f $HERE/device.tar.gz system assets hardware.yaml
) )
rm -rf $TMPDIR rm -rf $TMPDIR