X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..34d7258a8a136363197d63bac464524234c8eb6d:/package/util-linux/Makefile?ds=sidebyside

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 8ca8052ea..810a09367 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,24 +4,17 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 3822 2006-05-24 07:01:52Z nico $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
 PKG_VERSION:=2.12r
-PKG_RELEASE:=1
+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
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,21 +27,33 @@ endef
 define Package/fdisk
   $(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/cfdisk
+  $(call Package/util-linux/Default)
+  TITLE:=Partition table manipulation utility
+  DEPENDS:=+libncurses @!LINUX_2_6_ETRAX
   DESCRIPTION:=\
-	This package contains an utility for managing disk partition tables.
+	This package contains a utility for managing disk partition tables.
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
 define Package/losetup
   $(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility
+  DEPENDS:=@!LINUX_2_6_ETRAX
   DESCRIPTION:=\
-	This package contains an utility for managing loopback devices.
+	This package contains a utility for managing loopback devices.
 endef
 
 define Package/swap-utils
   $(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\\\
@@ -56,6 +61,15 @@ define Package/swap-utils
 	- swapoff
 endef
 
+define Package/hwclock
+  $(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 Build/Compile
 	$(call Build/Compile/Default, \
 		OPT="$(TARGET_CFLAGS)" \
@@ -70,7 +84,7 @@ define Package/Template
 		rm -f $(PKG_BUILD_DIR)/.built; \
 		$(MAKE) $(PKG_BUILD_DIR)/.built; \
 	fi
-	install -d -m0755 $(2)
+	$(INSTALL_DIR) $(2)
 	$(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/
 endef
 
@@ -78,6 +92,10 @@ define Package/fdisk/install
 	$(call Package/Template,sbin/fdisk,$(1)/usr/sbin)
 endef
 
+define Package/cfdisk/install
+	$(call Package/Template,sbin/cfdisk,$(1)/usr/sbin)
+endef
+
 define Package/losetup/install
 	$(call Package/Template,sbin/losetup,$(1)/usr/sbin)
 endef
@@ -88,6 +106,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))