diff mbox series

[v2,09/16] squashfs-tools: update to 4.7

Message ID 20250605161414.1050228-9-ross.burton@arm.com
State New
Headers show
Series [v2,01/16] libmodulemd: put version in recipe filename | expand

Commit Message

Ross Burton June 5, 2025, 4:14 p.m. UTC 
The REPRODUCIBLE_DEFAULT option was removed in 4.7[1].

Also clean up the tasks to be neater and more concise.

[1] squash-tools ae9914d15293af7c596148aedd997b3058e35d9e

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...uashfs-tools_4.6.1.bb => squashfs-tools_4.7.bb} | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
 rename meta/recipes-devtools/squashfs-tools/{squashfs-tools_4.6.1.bb => squashfs-tools_4.7.bb} (77%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb
similarity index 77%
rename from meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb
rename to meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb
index 51a2fbdb934..6357c8a5a93 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb
@@ -7,8 +7,8 @@  SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1"
-SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184"
+SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV}"
+SRCREV = "2e87d42ed089dc31990d83eeb07437b9d085d6d1"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
@@ -16,7 +16,7 @@  S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}"
 
-PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd reproducible"
+PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd"
 PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib"
 PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz"
 PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo"
@@ -24,17 +24,15 @@  PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4"
 PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz"
 PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
 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
+	oe_runmake -C ${S}/squashfs-tools all
 }
 
 do_install() {
-        cd ${S}/squashfs-tools
+	oe_runmake -C ${S}/squashfs-tools install INSTALL_PREFIX=${D}${prefix} INSTALL_MANPAGES_DIR=${D}${datadir}/man/man1
+
 	install -d "${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}"
 }