[package] base-files: cached state vars after scan_interfaces might be out of sync...

[openwrt.git] / package / kexec-tools / Makefile

diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 910b6a2..0e2ca22 100644 (file)
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,19 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools

-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.2

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/horms/kexec-tools
-PKG_MD5SUM:=d9f2ecd3c3307905f24130a25816e6cc
+PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec
+PKG_MD5SUM:=35d05fed1c97008ac34c5bfb929295eb
+
+PKG_FIXUP:=libtool

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kexec-tools
   SECTION:=utils
   CATEGORY:=Utilities
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kexec-tools
   SECTION:=utils
   CATEGORY:=Utilities

-  DEPENDS:=@armeb||@i386||@TARGET_ps3||@mipsel||@mips +zlib
+  DEPENDS:=@armeb||@arm||@i386||@powerpc64||@mipsel||@mips +zlib

   TITLE:=Kernel boots kernel
   URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
   MENU:=1
   TITLE:=Kernel boots kernel
   URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
   MENU:=1


@@ -32,12 +34,14 @@ define Package/kexec-tools/description
 endef
 
 define Package/kexec-tools/config
 endef
 
 define Package/kexec-tools/config

-       source "$(SOURCE)/kexec-config.in"
+       source "$(SOURCE)/Config.in"

 endef
 
 endef
 

+KEXEC_TARGET_NAME:=$(call qstrip,$(CONFIG_KEXEC_TOOLS_TARGET_NAME))-linux-$(TARGET_SUFFIX)
+

 CONFIGURE_ARGS = \
 CONFIGURE_ARGS = \

-               --target=$(CONFIG_KEXEC_TOOLS_TARGET_NAME)-linux-$(TARGET_SUFFIX) \
-               --host=$(GNU_TARGET_NAME)-uclibc \
+               --target=$(KEXEC_TARGET_NAME) \
+               --host=$(REAL_GNU_TARGET_NAME) \

                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \
                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \


@@ -46,21 +50,30 @@ CONFIGURE_ARGS = \
                --bindir=/usr/bin \
                --sbindir=/usr/sbin \
                --libexecdir=/usr/lib \
                --bindir=/usr/bin \
                --sbindir=/usr/sbin \
                --libexecdir=/usr/lib \

-               --sysconfdir=/etc \
+               --sysconfdir=/etc

 
 CONFIGURE_VARS += \
        BUILD_CC="$(HOSTCC)" \
 
 CONFIGURE_VARS += \
        BUILD_CC="$(HOSTCC)" \

-       TARGET_CC="$(TARGET_CC)" \
+       TARGET_CC="$(TARGET_CC)"
+
+kexec-extra-sbin-$(CONFIG_KEXEC_TOOLS_kdump) += kdump

 
 define Build/Compile
 
 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
 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
+
+# make a link for compatability with other distros
+       $(INSTALL_DIR) $(1)/sbin
+       ln -s /usr/sbin/kexec $(1)/sbin/kexec

 endef
 
 $(eval $(call BuildPackage,kexec-tools))
 endef
 
 $(eval $(call BuildPackage,kexec-tools))