From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Mon, 24 Aug 2009 20:11:46 +0000 (+0000)
Subject: kexec-tools: Make build of kdump optional
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a64a3b373a191e8056a572f50695bf9ba2414714;p=openwrt%2Fstaging%2F981213.git

kexec-tools: Make build of kdump optional

Most systems won't need kdump, so make its build optional.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

SVN-Revision: 17374
---

diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 4374b5b937..7ee1c2cd5b 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -56,15 +56,21 @@ CONFIGURE_VARS += \
 	BUILD_CC="$(HOSTCC)" \
 	TARGET_CC="$(TARGET_CC)"
 
+kexec-extra-sbin-$(CONFIG_KEXEC_TOOLS_kdump) += kdump
+
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/kexec-tools/install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(1)" \
-		install
-	rm -rf $(1)/usr/man
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(addprefix $(PKG_INSTALL_DIR)/usr/sbin/, \
+			$(kexec-extra-sbin-y)) \
+		$(kexec-extra-bin-y) \
+		$(PKG_INSTALL_DIR)/usr/sbin/kexec \
+		$(1)/usr/sbin
+
 endef
 
 $(eval $(call BuildPackage,kexec-tools))
diff --git a/package/kexec-tools/kexec-config.in b/package/kexec-tools/kexec-config.in
index 7aa3f1db2e..25fed1b7cd 100644
--- a/package/kexec-tools/kexec-config.in
+++ b/package/kexec-tools/kexec-config.in
@@ -8,3 +8,12 @@ config KEXEC_TOOLS_TARGET_NAME
 	  Defines the target type of the kernels that kexec deals
 	  with. This should be the target specification of
 	  the kernel you're booting.
+
+config KEXEC_TOOLS_kdump
+	bool
+	prompt "kdump support"
+	depends on PACKAGE_kexec-tools
+	default n
+	help
+	  Include the kdump utility.
+