From 85c6d94e846f729f9944e83606f38ef62c88e940 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Mon, 20 May 2019 11:36:45 -0300 Subject: [PATCH] stages: 2/02-squashfs: upgraded squashfs-tools to the latest commit --- sources/SOURCELIST.txt | 2 +- sources/squashfs-tools-20190415_3197524.tar.lz.sha256 | 1 + sources/squashfs-tools-master.zip.sha256 | 1 - stages/2/02-squashfs | 7 +++---- 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 sources/squashfs-tools-20190415_3197524.tar.lz.sha256 delete mode 100644 sources/squashfs-tools-master.zip.sha256 diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index ad99d09d..e8cd4451 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -209,7 +209,7 @@ http://rsync.dragora.org/current/sources/gpm-54651a0_dragora.tar.lz http://rsync.dragora.org/current/sources/libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz http://rsync.dragora.org/current/sources/net-tools-code-0eebece8c964e3cfa8a018f42b2e7e751a7009a0.zip http://rsync.dragora.org/current/sources/perp-2.07.tar.gz -http://rsync.dragora.org/current/sources/squashfs-tools-master.zip +http://rsync.dragora.org/current/sources/squashfs-tools-20190415_3197524.tar.lz http://rsync.dragora.org/current/sources/xf86-video-intel-e5ff8e1.tar.lz http://rsync.dragora.org/v3/sources/qi-1.1.tar.lz http://savannah.c3sl.ufpr.br/libpipeline/libpipeline-1.5.0.tar.gz diff --git a/sources/squashfs-tools-20190415_3197524.tar.lz.sha256 b/sources/squashfs-tools-20190415_3197524.tar.lz.sha256 new file mode 100644 index 00000000..b2ea6b11 --- /dev/null +++ b/sources/squashfs-tools-20190415_3197524.tar.lz.sha256 @@ -0,0 +1 @@ +add06efe31b4885021ed6fe2195850f7278ea1ae3f028d811c769492e076cf80 squashfs-tools-20190415_3197524.tar.lz diff --git a/sources/squashfs-tools-master.zip.sha256 b/sources/squashfs-tools-master.zip.sha256 deleted file mode 100644 index 80bafcd8..00000000 --- a/sources/squashfs-tools-master.zip.sha256 +++ /dev/null @@ -1 +0,0 @@ -75cd649cd77efc226a4951cf669f69ae68f104924187cf24f00ef6aabc4ba2a0 squashfs-tools-master.zip diff --git a/stages/2/02-squashfs b/stages/2/02-squashfs index a342052d..b3b1ccb0 100755 --- a/stages/2/02-squashfs +++ b/stages/2/02-squashfs @@ -15,13 +15,12 @@ # limitations under the License. # From http://github.com/plougher/squashfs-tools -# commit 6e242dc -version=master +version=20190415_3197524 cd -- "$TMPDIR" rm -rf squashfs-tools-${version} \ "${rootdir}/squashfs-tools_lzip" -unpack "${worktree}/sources/squashfs-tools-${version}.zip" +unpack "${worktree}/sources/squashfs-tools-${version}.tar.lz" # Build instructions cd squashfs-tools-${version} @@ -35,7 +34,7 @@ cd squashfs-tools-${version} patch -p1 < "${worktree}/patches/squashfs-tools/squashfs-tools-20180628_lzip-0.diff" # Apply some patches from http://sources.debian.org/patches/squashfs-tools/1:4.3-12/ -# to make it the final ISO more reliable +# to make the Live ISO image more reliable for file in "${worktree}/patches/squashfs-tools"/????-*.patch do echo "Applying patch: $file ..." -- 2.11.4.GIT