Просмотр исходного кода

kexec-tools: make zlib support optional, but enabled by default

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 37071
Felix Fietkau 12 лет назад
Родитель
Сommit
ea5f9a7ba7
2 измененных файлов с 10 добавлено и 2 удалено
  1. 5 0
      package/boot/kexec-tools/Config.in
  2. 5 2
      package/boot/kexec-tools/Makefile

+ 5 - 0
package/boot/kexec-tools/Config.in

@@ -18,4 +18,9 @@ config KEXEC_TOOLS_kdump
 	help
 	  Include the kdump utility.
 
+config KEXEC_ZLIB
+	bool
+	prompt "zlib support"
+	default y
+
 endmenu

+ 5 - 2
package/boot/kexec-tools/Makefile

@@ -17,12 +17,14 @@ PKG_MD5SUM:=b3ced2097ce3981abba38ceedc84f939
 
 PKG_FIXUP:=autoreconf
 
+PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kexec-tools
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@armeb||@arm||@i386||@powerpc64||@mipsel||@mips +zlib
+  DEPENDS:=@armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib
   TITLE:=Kernel boots kernel
   URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
   MAINTAINER:=Florian Fainelli <[email protected]>
@@ -51,7 +53,8 @@ CONFIGURE_ARGS = \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
 		--libexecdir=/usr/lib \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		$(if $(CONFIG_KEXEC_ZLIB),--with,--without)-zlib
 
 CONFIGURE_VARS += \
 	BUILD_CC="$(HOSTCC)" \