diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-04 17:31:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-04 17:37:23 +0000 |
commit | e37a1ecc292b684daa49f2da2e19e0aa975f0959 (patch) | |
tree | f76473d22c2545bc526ed0997a4715e2821b3507 /meta | |
parent | 6683a29cfd10c3796943ae8485310521ca55c446 (diff) | |
download | openembedded-core-contrib-e37a1ecc292b684daa49f2da2e19e0aa975f0959.tar.gz |
squashfs-tools: add PACKAGECONFIGs for all the tunables
Upstream lets you control what compression algorithms are used, so add
PACKAGECONFIGs for them all.
Instead of bundling a copy of the SevenZIP SDK from 2009 (!), reuse XZ. This
means we can drop Public Domain from the license list.
Also -e was removed from EXTRA_OEMAKE in 2016 (oe-core aeb653) so the fiddling
to work around that can be removed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 2f41263457..e871f1cbf5 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -2,16 +2,12 @@ # 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" 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 \ @@ -23,14 +19,20 @@ SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e 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" +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" do_compile() { oe_runmake mksquashfs unsquashfs } + do_install () { install -d ${D}${sbindir} install -m 0755 mksquashfs ${D}${sbindir}/ |