merge the control file and the .ipk file targets into one to prevent them from going...

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

diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 108492d..81ae9d3 100644 (file)
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -1,27 +1,26 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 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.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools

-PKG_VERSION:=testing-20080227
+PKG_VERSION:=2.0.0

 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:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
-PKG_MD5SUM:=45455af789545fdfaff2401d1988996a
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/horms/kexec-tools
+PKG_MD5SUM:=d9f2ecd3c3307905f24130a25816e6cc

 
 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:=@i386||@powerpc +zlib
+  DEPENDS:=@armeb||@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


@@ -36,9 +35,11 @@ define Package/kexec-tools/config
        source "$(SOURCE)/kexec-config.in"
 endef
 
        source "$(SOURCE)/kexec-config.in"
 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-uclibc \
-               --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="" \


@@ -49,7 +50,9 @@ CONFIGURE_ARGS = \
                --libexecdir=/usr/lib \
                --sysconfdir=/etc \
 
                --libexecdir=/usr/lib \
                --sysconfdir=/etc \
 

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

 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) all
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) all