diff options
Diffstat (limited to 'meta/recipes-devtools/squashfs-tools')
| -rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 21 |
2 files changed, 11 insertions, 44 deletions
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 deleted file mode 100644 index b505f05735..0000000000 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c9e263a7add76df1ed92e879d964264067c0f6e8 Mon Sep 17 00:00:00 2001 -From: Patrick McCarty <patrick.mccarty@intel.com> -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 <patrick.mccarty@intel.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - 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 c78f446711..982a43f889 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -4,16 +4,15 @@ SUMMARY = "Tools for manipulating SquashFS filesystems" HOMEPAGE = "https://github.com/plougher/squashfs-tools" DESCRIPTION = "Tools to create and extract Squashfs filesystems." SECTION = "base" -LICENSE = "GPL-2" -LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "4.5" -SRCREV = "0496d7c3de3e09da37ba492081c86159806ebb07" -SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ - file://0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch \ - " +PV = "4.6.1" +SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184" +SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" -S = "${WORKDIR}/git/squashfs-tools" +S = "${WORKDIR}/git" EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" @@ -28,13 +27,15 @@ PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd" PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0," do_compile() { + cd ${S}/squashfs-tools oe_runmake all } do_install() { + cd ${S}/squashfs-tools install -d "${D}${includedir}" - oe_runmake install INSTALL_DIR=${D}${sbindir} - install -m 0644 "${S}"/squashfs_fs.h "${D}${includedir}" + oe_runmake install INSTALL_PREFIX=${D}${prefix} INSTALL_MANPAGES_DIR=${D}${datadir}/man/man1 + install -m 0644 "${S}"/squashfs-tools/squashfs_fs.h "${D}${includedir}" } ARM_INSTRUCTION_SET:armv4 = "arm" |