[OpenWrt-Devel] [RFC 6/7] kexec-tools: add choice for selecting lzma support.

Yousong Zhou yszhou4tech at gmail.com
Fri Jan 23 08:52:11 EST 2015


Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 package/boot/kexec-tools/Config.in |    5 +++++
 package/boot/kexec-tools/Makefile  |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/boot/kexec-tools/Config.in b/package/boot/kexec-tools/Config.in
index 2642171..6c7558f 100644
--- a/package/boot/kexec-tools/Config.in
+++ b/package/boot/kexec-tools/Config.in
@@ -23,4 +23,9 @@ config KEXEC_ZLIB
 	prompt "zlib support"
 	default y
 
+config KEXEC_LZMA
+	bool
+	prompt "lzma support"
+	default n
+
 endmenu
diff --git a/package/boot/kexec-tools/Makefile b/package/boot/kexec-tools/Makefile
index e884661..4a8900d 100644
--- a/package/boot/kexec-tools/Makefile
+++ b/package/boot/kexec-tools/Makefile
@@ -17,14 +17,14 @@ PKG_MD5SUM:=05992bc8c0673fc55be7b6d27e48a8db
 
 PKG_FIXUP:=autoreconf
 
-PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB
+PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB CONFIG_KEXEC_LZMA
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kexec-tools
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@KERNEL_KEXEC @armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib
+  DEPENDS:=@KERNEL_KEXEC @armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma
   TITLE:=Kernel boots kernel
   URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
   MAINTAINER:=Florian Fainelli <florian at openwrt.org>
@@ -55,7 +55,7 @@ CONFIGURE_ARGS = \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		$(if $(CONFIG_KEXEC_ZLIB),--with,--without)-zlib \
-		--without-lzma
+		$(if $(CONFIG_KEXEC_LZMA),--with,--without)-lzma
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
 TARGET_LDFLAGS += -Wl,--gc-sections
-- 
1.7.10.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list