From f4995a0b05de5e92d0d7f01489673d770f371f93 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 22 Aug 2021 14:50:39 +0200 Subject: squashfs-tools: upgrade 4.4 -> 4.5 (From OE-Core rev: 142ad53513cae2b9b5bf16524e29b97477bb3dd0) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...fs-tools-fix-build-failure-against-gcc-10.patch | 45 ---------------------- ...id-use-of-INSTALL_DIR-for-symlink-targets.patch | 34 ++++++++++++++++ .../squashfs-tools/squashfs-tools_git.bb | 8 ++-- 3 files changed, 38 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch (limited to 'meta/recipes-devtools/squashfs-tools') diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index fc881862ea..0000000000 --- a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 94e1911ca24726b7cb3efe2f8b9eb7a784757e18 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 26 Jan 2020 18:35:13 +0000 -Subject: [PATCH] squashfs-tools: fix build failure against gcc-10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -cc ... -o mksquashfs -ld: read_fs.o:(.bss+0x0): - multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here -ld: read_fs.o:(.bss+0x8): - multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Toralf Förster -Bug: https://bugs.gentoo.org/706456 -Signed-off-by: Sergei Trofimovich -Signed-off-by: Jacob Kroon -Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5] ---- - squashfs-tools/mksquashfs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 1beefef..b650306 100644 ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -143,7 +143,7 @@ struct append_file { - #endif - - extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; --struct cache *bwriter_buffer, *fwriter_buffer; -+extern struct cache *bwriter_buffer, *fwriter_buffer; - extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, - *to_frag, *locked_fragment, *to_process_frag; - extern struct append_file **file_mapping; diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch new file mode 100644 index 0000000000..b505f05735 --- /dev/null +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch @@ -0,0 +1,34 @@ +From c9e263a7add76df1ed92e879d964264067c0f6e8 Mon Sep 17 00:00:00 2001 +From: Patrick McCarty +Date: Mon, 26 Jul 2021 11:38:43 -0700 +Subject: [PATCH] Avoid use of INSTALL_DIR for symlink targets + +In case INSTALL_DIR is overridden with a staged install location, using +INSTALL_DIR for the symlink target path prefix will yield an incorrect location +for the final installation. + +Because the symlink itself is already installed to INSTALL_DIR, simply removing +the INSTALL_DIR prefix suffices as a fix. + +Note that using $DESTDIR/$INSTALL_DIR where appropriate can avoid this type of +issue, but that can be considered a future enhancement. + +Upstream-Status: Backport +Signed-off-by: Patrick McCarty +Signed-off-by: Alexander Kanavin +--- + squashfs-tools/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile +index 5795d0d..998c5fd 100755 +--- a/Makefile ++++ b/Makefile +@@ -406,5 +406,5 @@ install: mksquashfs unsquashfs + mkdir -p $(INSTALL_DIR) + cp mksquashfs $(INSTALL_DIR) + cp unsquashfs $(INSTALL_DIR) +- ln -fs $(INSTALL_DIR)/unsquashfs $(INSTALL_DIR)/sqfscat +- ln -fs $(INSTALL_DIR)/mksquashfs $(INSTALL_DIR)/sqfstar ++ ln -fs unsquashfs $(INSTALL_DIR)/sqfscat ++ ln -fs mksquashfs $(INSTALL_DIR)/sqfstar diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 1a9e8f108b..2b9a765bb2 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -7,11 +7,11 @@ SECTION = "base" LICENSE = "GPL-2" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "4.4" -SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67" +PV = "4.5" +SRCREV = "0496d7c3de3e09da37ba492081c86159806ebb07" SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ - file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \ -" + file://0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch \ + " S = "${WORKDIR}/git/squashfs-tools" -- cgit v1.2.3-54-g00ecf