[Buildroot] [PATCH 1/1] package/kexec: add optional support for xz

[Buildroot] [PATCH 1/1] package/kexec: add optional support for xz

[Bernd Kuhls]

When xz was compiled before, kexec will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/sbin/kdump | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [liblzma.so.5]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kexec/kexec.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index d158406..7264a1c 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -17,6 +17,17 @@ else
 KEXEC_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_XZ),y)
+# fixes broken check for xz when cross-compiling:
+# checking for lzma_code in -llzma...
+# ./configure: line 4712: ac_fn_c_try_link: command not found
+KEXEC_CONF_ENV += ac_cv_lib_lzma_lzma_code=yes
+KEXEC_CONF_OPTS += --with-lzma
+KEXEC_DEPENDENCIES += xz
+else
+KEXEC_CONF_OPTS += --without-lzma
+endif
+
 define KEXEC_REMOVE_LIB_TOOLS
 	rm -rf $(TARGET_DIR)/usr/lib/kexec-tools
 endef
-- 
2.7.0

[Buildroot] [PATCH 1/1] package/kexec: add optional support for xz

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 20 Feb 2016 23:31:54 +0100, Bernd Kuhls wrote:

> +ifeq ($(BR2_PACKAGE_XZ),y)
> +# fixes broken check for xz when cross-compiling:
> +# checking for lzma_code in -llzma...
> +# ./configure: line 4712: ac_fn_c_try_link: command not found
> +KEXEC_CONF_ENV += ac_cv_lib_lzma_lzma_code=yes

Instead of this, I've added a bump to version 2.0.11, which contains an
upstream commit that fixes this issue. Yes, it's a version bump on
master, but it's a minor version bump, so I think it's reasonable.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com