Merge ~rbalint/livecd-rootfs:ubuntu/master

live-build/auto/build

@@ -475,7 +475,7 @@ for ISO in binary.iso binary.hybrid.iso; do
 done
 
 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"
 	chmod 644 "$PREFIX.rootfs.tar.gz"
 elif [ -e binary-tar.tar.gz ]; then
@@ -512,7 +512,7 @@ EOF
 fi
 
 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"
 	chmod 644 "$PREFIX.custom.tar.gz"
 fi
@@ -649,7 +649,7 @@ case $PROJECT:${SUBPROJECT:-} in
                raspi2)
                    # ubuntu-device-flash does not like subdirs here, we need to tar it up
                    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
                    fi
                    ;;
@@ -698,7 +698,7 @@ EOF
             manifestname="$devarch.$manifestname"
         fi
         # 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
         cp assets/dpkg.list $HERE/$PREFIX.$manifestname

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

@@ -12,4 +12,4 @@ fi
 rootfs_dir=rootfs.dir
 
 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

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

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

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

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

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

@@ -62,7 +62,7 @@ fi
 # and tar it up
 (
  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