X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d1d593a9772d2f1861c67f01a0924200a2ca98d8..35a0fb9185194743f1d43c07dea98347e052a96a:/package/util-linux/Makefile?ds=sidebyside

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 6c5a6972f..2ea4c7e56 100644
--- 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_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
@@ -24,62 +21,75 @@ include $(INCLUDE_DIR)/package.mk
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
+  DEPENDS:=@!TARGET_etrax
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
 define Package/fdisk
-  $(call Package/util-linux/Default)
+$(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility
-  DEPENDS:=@!LINUX_2_6_ETRAX
-  DESCRIPTION:=\
-	This package contains a utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+endef
+
+define Package/fdisk/description
+ This package contains a utility for managing disk partition tables.
 endef
 
 define Package/cfdisk
-  $(call Package/util-linux/Default)
+$(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility
-  DEPENDS:=+libncurses @!LINUX_2_6_ETRAX
-  DESCRIPTION:=\
-	This package contains a utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+  DEPENDS:= +libncurses
+endef
+
+define Package/cfdisk/description
+ This package contains a utility for managing disk partition tables.
 endef
 
 define Package/losetup
-  $(call Package/util-linux/Default)
+$(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility
-  DEPENDS:=@!LINUX_2_6_ETRAX
-  DESCRIPTION:=\
-	This package contains a utility for managing loopback devices.
+endef
+
+define Package/losetup/description
+ This package contains a utility for managing loopback devices.
 endef
 
 define Package/swap-utils
-  $(call Package/util-linux/Default)
+$(call Package/util-linux/Default)
   TITLE:=Swap space management utilities
-  DEPENDS:=@!LINUX_2_6_ETRAX
-  DESCRIPTION:=\
-	This package contains a collection of tools for managing swap space: \\\
-	- mkswap\\\
-	- swapon\\\
-	- swapoff
+endef
+
+define Package/swap-utils/description
+ This package contains a collection of tools for managing swap space: 
+ - mkswap
+ - swapon
+ - swapoff
 endef
 
 define Package/hwclock
-  $(call Package/util-linux/Default)
+$(call Package/util-linux/Default)
   TITLE:=Utilities for managing the hardware clock
-  DEPENDS:=@!LINUX_2_6_ETRAX
-  DESCRIPTION:=\
-  	 This package contains a utility for managing the hardware clock
 endef
 
-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
+define Package/hwclock/description
+ This package contains a utility for managing the hardware clock.
+endef
+
+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
-	$(call Build/Compile/Default, \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		OPT="$(TARGET_CFLAGS)" \
 		INSTALLSUID="install -m 4755" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install \
-	)
+		all install
 endef
 
 define Package/Template