diff options
| author | Ross Burton <ross@burtonini.com> | 2021-12-20 18:26:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-21 12:01:41 +0000 |
| commit | 73cf74b4d90032afc39f39b7e3c2409d6114c36f (patch) | |
| tree | 96ae03443eb9f22a634756c10f79b61a7333d7bf | |
| parent | c6afe999228b642fe15fe031d7fbb2544e284db4 (diff) | |
| download | poky-73cf74b4d90032afc39f39b7e3c2409d6114c36f.tar.gz | |
kmod: expand compression PACKAGECONFIGs
Turn the explicitly enabled zlib support into an enabled by default
PACKAGECONFIG, and add Zstd support (disabled by default).
(From OE-Core rev: 6dd6184f01d79ebd26347a6006f92a5b5906ee3e)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod_29.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-kernel/kmod/kmod_29.bb b/meta/recipes-kernel/kmod/kmod_29.bb index 904a17d9d0..9ac5214df6 100644 --- a/meta/recipes-kernel/kmod/kmod_29.bb +++ b/meta/recipes-kernel/kmod/kmod_29.bb | |||
| @@ -24,17 +24,19 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master | |||
| 24 | 24 | ||
| 25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
| 26 | 26 | ||
| 27 | EXTRA_OECONF += "--enable-tools --with-zlib" | 27 | EXTRA_OECONF += "--enable-tools" |
| 28 | 28 | ||
| 29 | PACKAGECONFIG ??= "zlib" | ||
| 29 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | 30 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" |
| 30 | PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" | 31 | PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" |
| 31 | PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" | 32 | PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" |
| 32 | PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" | ||
| 33 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" | 33 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" |
| 34 | PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" | ||
| 35 | PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" | ||
| 36 | PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" | ||
| 34 | 37 | ||
| 35 | GTKDOC_DOCDIR = "${S}/libkmod/docs" | 38 | GTKDOC_DOCDIR = "${S}/libkmod/docs" |
| 36 | 39 | ||
| 37 | DEPENDS += "zlib" | ||
| 38 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 40 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
| 39 | RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 41 | RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
| 40 | RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 42 | RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
