From 3bd799ce2277c0364c255a05da711e6e19d17cba Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Thu, 28 Aug 2014 14:21:33 +0200 Subject: [PATCH] kexec-lite: Depends on elfutils instead of libelf to get the libelf library The elfutils package provides a more recent version of the libelf, so let's use it. It will allow to remove the libelf package and to avoid conflicts with two packages providing the same library. [Peter: adjust toolchain options comment to match] Signed-off-by: Gregory CLEMENT Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/kexec-lite/Config.in | 8 +++++--- package/kexec-lite/kexec-lite.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/kexec-lite/Config.in b/package/kexec-lite/Config.in index 944ee29e96..e98ad3ab96 100644 --- a/package/kexec-lite/Config.in +++ b/package/kexec-lite/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_KEXEC_LITE bool "kexec-lite" depends on BR2_powerpc || BR2_powerpc64 depends on !BR2_PREFER_STATIC_LIB # dtc - select BR2_PACKAGE_LIBELF + depends on BR2_LARGEFILE # elfutils + depends on BR2_USE_WCHAR # elfutils + select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_DTC select BR2_PACKAGE_DTC_PROGRAMS help @@ -12,6 +14,6 @@ config BR2_PACKAGE_KEXEC_LITE This package is a tiny implementation of the kexec userspace components, for devicetree-based platforms. -comment "kexec-lite needs a toolchain w/ dynamic library" +comment "kexec-lite needs a toolchain w/ largefile, wchar, dynamic library" depends on BR2_powerpc || BR2_powerpc64 - depends on BR2_PREFER_STATIC_LIB + depends on BR2_PREFER_STATIC_LIB || !BR2_LARGEFILE || !BR2_USE_WCHAR diff --git a/package/kexec-lite/kexec-lite.mk b/package/kexec-lite/kexec-lite.mk index 7028c6ef84..7e3c8d30f8 100644 --- a/package/kexec-lite/kexec-lite.mk +++ b/package/kexec-lite/kexec-lite.mk @@ -7,7 +7,7 @@ KEXEC_LITE_VERSION = fb8543fea3beb0522b5a63a74ea1a845dbd7b954 KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION)) KEXEC_LITE_LICENSE = GPLv2+ -KEXEC_LITE_DEPENDENCIES = libelf dtc +KEXEC_LITE_DEPENDENCIES = elfutils dtc define KEXEC_LITE_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -- 2.30.2