X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5b8df1d94e5834c68a1b51208f869ad2f8cbf557..080c74e2121e4edb7e939a6141932f5c8e5958a3:/package/util-linux/Makefile

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 43d7f7fb9..602d1d599 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,51 +21,78 @@ 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
-  DESCRIPTION:=\
-	This package contains an utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+  SUBMENU=disc
+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
-  DESCRIPTION:=\
-	This package contains an utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+  DEPENDS:= +libncurses
+  SUBMENU:=disc
+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
-  DESCRIPTION:=\
-	This package contains an 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
-  DESCRIPTION:=\
-	This package contains a collection of tools for managing swap space: \\\
-	- mkswap\\\
-	- swapon\\\
-	- swapoff
+  SUBMENU:=disc
+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)
+  TITLE:=Utilities for managing the hardware clock
+endef
+
+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
 
-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
 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
@@ -98,7 +122,12 @@ define Package/swap-utils/install
 	$(call Package/Template,sbin/swapoff,$(1)/usr/sbin)
 endef
 
+define Package/hwclock/install
+	$(call Package/Template,sbin/hwclock,$(1)/usr/sbin)
+endef
+
 $(eval $(call BuildPackage,fdisk))
 $(eval $(call BuildPackage,cfdisk))
 $(eval $(call BuildPackage,losetup))
 $(eval $(call BuildPackage,swap-utils))
+$(eval $(call BuildPackage,hwclock))