acx-mac80211 fixes:

[openwrt.git] / package / util-linux / Makefile

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index f624e92..c5c574c 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -13,10 +13,7 @@ PKG_VERSION:=2.12r
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       http://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       ftp://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       http://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/

 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 
 include $(INCLUDE_DIR)/package.mk
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 
 include $(INCLUDE_DIR)/package.mk


@@ -24,6 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities

+  DEPENDS:=@!LINUX_2_6_ETRAX

   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 


@@ -38,7 +36,7 @@ endef
 define Package/cfdisk
   $(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility
 define Package/cfdisk
   $(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility

-  DEPENDS:=+libncurses
+  DEPENDS+= +libncurses

   DESCRIPTION:=\
        This package contains a utility for managing disk partition tables.
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
   DESCRIPTION:=\
        This package contains a utility for managing disk partition tables.
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/


@@ -68,14 +66,22 @@ define Package/hwclock
         This package contains a utility for managing the hardware clock
 endef
 
         This package contains a utility for managing the hardware clock
 endef
 

-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
+define Build/Configure
+       # this is NOT GNU configure!
+       ( cd $(PKG_BUILD_DIR); \
+               CC="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+               ./configure \
+       );
+endef
+

 define Build/Compile
 define Build/Compile

-       $(call Build/Compile/Default, \
+       $(MAKE) -C $(PKG_BUILD_DIR) \

                OPT="$(TARGET_CFLAGS)" \
                INSTALLSUID="install -m 4755" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                OPT="$(TARGET_CFLAGS)" \
                INSTALLSUID="install -m 4755" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               all install \
-       )
+               all install

 endef
 
 define Package/Template
 endef
 
 define Package/Template