Merge pull request #4396 from tyhicks/no-fragments

snap: use the -no-fragments mksquashfs option
snapcore · Dec 20, 2017 · e1eddad · e1eddad
2 parents e13f0f9 + 554bed1
commit e1eddad
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/cmd/snap-confine/spread-tests/regression/lp-1599608/task.yaml b/cmd/snap-confine/spread-tests/regression/lp-1599608/task.yaml
@@ -27,7 +27,7 @@ prepare: |
     unsquashfs $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap.orig | tail -1)
     echo 'echo PATH=$PATH > /run/udev/spread-test.out' >> ./squashfs-root/lib/udev/snappy-app-dev
     echo 'echo TESTVAR=$TESTVAR >> /run/udev/spread-test.out' >> ./squashfs-root/lib/udev/snappy-app-dev
-    mksquashfs ./squashfs-root $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap.orig | tail -1 | sed 's/.orig//') -comp xz
+    mksquashfs ./squashfs-root $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap.orig | tail -1 | sed 's/.orig//') -comp xz -no-fragments
     if [ ! -e $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap | tail -1) ]; then exit 1; fi
     echo "Mount modified core snap"
     mount $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap | tail -1) $(ls -1d /snap/ubuntu-core/* | grep -v current | tail -1)

diff --git a/snap/squashfs/squashfs.go b/snap/squashfs/squashfs.go
@@ -155,6 +155,7 @@ func (s *Snap) Build(buildDir string) error {
 			"-noappend",
 			"-comp", "xz",
 			"-no-xattrs",
+			"-no-fragments",
 		).Run()
 	})
 }
diff --git a/tests/lib/snaps.sh b/tests/lib/snaps.sh
@@ -41,9 +41,9 @@ mksnap_fast() {
 
     if [[ "$SPREAD_SYSTEM" == ubuntu-14.04-* ]]; then
         # trusty does not support  -Xcompression-level 1
-        mksquashfs "$dir" "$snap" -comp gzip
+        mksquashfs "$dir" "$snap" -comp gzip -no-fragments
     else
-        mksquashfs "$dir" "$snap" -comp gzip -Xcompression-level 1
+        mksquashfs "$dir" "$snap" -comp gzip -Xcompression-level 1 -no-fragments
     fi
 }
 

diff --git a/tests/main/confinement-classic/test-snapd-hello-classic/Makefile b/tests/main/confinement-classic/test-snapd-hello-classic/Makefile
@@ -63,7 +63,7 @@ test-snapd-hello-classic.$(snap_arch).bin: test-snapd-hello-classic.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 $(snap_file): test-snapd-hello-classic.$(snap_arch).bin meta/snap.yaml
-	mksquashfs . $@ -e $@ -noappend -no-xattrs -comp xz
+	mksquashfs . $@ -e $@ -noappend -no-xattrs -comp xz -no-fragments
 
 meta: Makefile
 	mkdir -p $@

diff --git a/tests/main/ubuntu-core-custom-device-reg-extras/task.yaml b/tests/main/ubuntu-core-custom-device-reg-extras/task.yaml
@@ -16,7 +16,7 @@ prepare: |
     unsquashfs /var/lib/snapd/snaps/pc_*.snap
     mkdir -p squashfs-root/meta/hooks
     cp prepare-device squashfs-root/meta/hooks
-    mksquashfs squashfs-root pc_x1.snap -comp xz
+    mksquashfs squashfs-root pc_x1.snap -comp xz -no-fragments
     rm -rf squashfs-root
     cp pc_x1.snap /var/lib/snapd/seed/snaps/
     mv /var/lib/snapd/seed/assertions/model model.bak

diff --git a/tests/main/ubuntu-core-custom-device-reg/task.yaml b/tests/main/ubuntu-core-custom-device-reg/task.yaml
@@ -15,7 +15,7 @@ prepare: |
     unsquashfs /var/lib/snapd/snaps/pc_*.snap
     mkdir -p squashfs-root/meta/hooks
     cp prepare-device squashfs-root/meta/hooks
-    mksquashfs squashfs-root pc_x1.snap -comp xz
+    mksquashfs squashfs-root pc_x1.snap -comp xz -no-fragments
     rm -rf squashfs-root
     cp pc_x1.snap /var/lib/snapd/seed/snaps/
     mv /var/lib/snapd/seed/assertions/model model.bak

diff --git a/tests/main/ubuntu-core-gadget-config-defaults/task.yaml b/tests/main/ubuntu-core-gadget-config-defaults/task.yaml
@@ -28,7 +28,7 @@ prepare: |
          a: A
          b: B
     EOF
-    mksquashfs squashfs-root pc_x1.snap -comp xz
+    mksquashfs squashfs-root pc_x1.snap -comp xz -no-fragments
     rm -rf squashfs-root
     cp pc_x1.snap /var/lib/snapd/seed/snaps/
     cp test-snapd-with-configure_*.snap /var/lib/snapd/seed/snaps/