diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb')
| -rw-r--r-- | external/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/external/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/external/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 2f412634..b06951df 100644 --- a/external/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/external/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -2,39 +2,35 @@ # and I don't think the kernel supports it any more. SUMMARY = "Tools for manipulating SquashFS filesystems" SECTION = "base" -LICENSE = "GPL-2 & PD" -LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://../../7zC.txt;beginline=12;endline=16;md5=2056cd6d919ebc3807602143c7449a7c \ -" -DEPENDS = "attr zlib xz lzo lz4" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "4.3+gitr${SRCPV}" -SRCREV = "9c1db6d13a51a2e009f0027ef336ce03624eac0d" +PV = "4.4" +SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67" SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ - http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2;name=lzma \ - file://0001-mksquashfs.c-get-inline-functions-work-with-C99.patch;striplevel=2 \ - file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \ - file://fix-compat.patch \ - file://0001-squashfs-tools-patch-for-CVE-2015-4645-6.patch;striplevel=2 \ + file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \ " -UPSTREAM_CHECK_COMMITS = "1" -SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759" -SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e" S = "${WORKDIR}/git/squashfs-tools" -# EXTRA_OEMAKE is typically: -e MAKEFLAGS= -# the -e causes problems as CFLAGS is modified in the Makefile, so -# we redefine EXTRA_OEMAKE here -EXTRA_OEMAKE = "MAKEFLAGS= LZMA_SUPPORT=1 LZMA_DIR=../.. XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1" +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" + +PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr reproducible" +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" +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() { - oe_runmake mksquashfs unsquashfs + oe_runmake all } -do_install () { - install -d ${D}${sbindir} - install -m 0755 mksquashfs ${D}${sbindir}/ - install -m 0755 unsquashfs ${D}${sbindir}/ + +do_install() { + oe_runmake install INSTALL_DIR=${D}${sbindir} } ARM_INSTRUCTION_SET_armv4 = "arm" @@ -42,3 +38,5 @@ ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv6 = "arm" BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "squashfs" |