From 6b90cf70065dbab180121817b2364227e7c6d7b8 Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Thu, 9 Apr 2020 10:43:12 +0200 Subject: [PATCH] coverage.sh: workaround for squashfs-tools-ng/issues/42 --- coverage.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coverage.sh b/coverage.sh index 394dc7f..9ec2ffd 100755 --- a/coverage.sh +++ b/coverage.sh @@ -720,7 +720,10 @@ $CMD --mode=$defaultmode --variant=apt $DEFAULT_DIST /tmp/debian-chroot.squashfs printf 'hsqs' | cmp --bytes=4 /tmp/debian-chroot.squashfs - # workaround for https://github.com/AgentD/squashfs-tools-ng/issues/37 sed 's#\\([^.]\\)/\$#\\1#' tar1.txt | sort > /tmp/tar1noslash.txt -sqfs2tar --no-skip --root-becomes . /tmp/debian-chroot.squashfs | tar -t | sort | diff -u /tmp/tar1noslash.txt - +# workaround for https://github.com/AgentD/squashfs-tools-ng/issues/42 +sqfs2tar --no-skip --root-becomes . /tmp/debian-chroot.squashfs | tar -t \ + | sed 's#\\([^.]\\)/\$#\\1#' \ + | sort | diff -u /tmp/tar1noslash.txt - rm /tmp/debian-chroot.squashfs /tmp/tar1noslash.txt END if [ "$HAVE_QEMU" = "yes" ]; then