X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Futil-linux-ng%2FMakefile;h=97d9568953955843463c7485c808c9d76b4e217f;hb=cd48af9071c6b72c337ee48c2454deb8f90313f7;hp=057791a694ddfb143512affe38dfd7da72dc26e5;hpb=5dc36a465d0b7909a1e6a0a662150819e8fdaac6;p=openwrt.git

diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 057791a694..97d9568953 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux-ng
 PKG_VERSION:=2.13.0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.13
@@ -22,7 +22,6 @@ 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-ng/
 endef
 
@@ -47,6 +46,16 @@ define Package/cfdisk/description
  This package contains a utility for managing disk partition tables.
 endef
 
+define Package/sfdisk
+$(call Package/util-linux/Default)
+  TITLE:=Partition table manipulation utility (Command-line)
+  SUBMENU=disc
+endef
+
+define Package/sfdisk/description
+ This package contains a utility for managing disk partition tables using command-line only.
+endef
+
 define Package/losetup
 $(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility
@@ -89,11 +98,34 @@ define Package/hwclock/description
  This package contains a utility for managing the hardware clock.
 endef
 
+define Package/flock
+$(call Package/util-linux/Default)
+  TITLE:=Manage file locks from shell scripts
+endef
+
+define Package/flock/description
+  This package contains a utility for managing file locks from shell scripts.
+endef
+
+define Package/setterm
+$(call Package/util-linux/Default)
+  TITLE:=Tool for setting terminal attributes
+  SUBMENU:=terminal
+  DEPENDS:= +libncurses
+endef
+
+define Package/setterm/description
+  This package contains a utility for setting terminal attributes
+endef
+
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/disk-utils mkswap
 	$(MAKE) -C $(PKG_BUILD_DIR)/mount swapon losetup umount mount
-	$(MAKE) -C $(PKG_BUILD_DIR)/fdisk fdisk cfdisk
+	$(MAKE) -C $(PKG_BUILD_DIR)/fdisk fdisk cfdisk sfdisk
 	$(MAKE) -C $(PKG_BUILD_DIR)/hwclock hwclock
+	$(MAKE) -C $(PKG_BUILD_DIR)/sys-utils flock
+	$(MAKE) -C $(PKG_BUILD_DIR)/misc-utils setterm
 endef
 
 define Package/fdisk/install
@@ -106,6 +138,11 @@ define Package/cfdisk/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/
 endef
 
+define Package/sfdisk/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/
+endef
+
 define Package/losetup/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/sbin/
@@ -127,9 +164,23 @@ define Package/hwclock/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/
 endef
 
+define Package/flock/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/flock $(1)/usr/bin/
+endef
+
+define Package/setterm/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/setterm $(1)/usr/bin/
+endef
+
+
 $(eval $(call BuildPackage,fdisk))
 $(eval $(call BuildPackage,cfdisk))
+$(eval $(call BuildPackage,sfdisk))
 $(eval $(call BuildPackage,losetup))
 $(eval $(call BuildPackage,mount-utils))
 $(eval $(call BuildPackage,swap-utils))
 $(eval $(call BuildPackage,hwclock))
+$(eval $(call BuildPackage,flock))
+$(eval $(call BuildPackage,setterm))