adm8668: merge 3.3 fixes

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

diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index f6593f73550c738140710c5a44a88ec1a2221ee2..0e1ac928be3727f0fd7e785d01e7a16ed948049b 100644 (file)
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 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,20 +9,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux-ng
 PKG_VERSION:=2.13.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.13
 PKG_MD5SUM:=c841dc8743905c8f0db20c9db5094f57
 
-PKG_BUILD_DEPENDS=libblkid libuuid
+PKG_BUILD_DEPENDS=e2fsprogs libncurses
 
 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
 
@@ -38,15 +37,25 @@ endef
 
 define Package/cfdisk
 $(call Package/util-linux/Default)
+  SUBMENU:=disc
   TITLE:=Partition table manipulation utility
   DEPENDS:= +libncurses
-  SUBMENU:=disc
 endef
 
 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
@@ -59,6 +68,7 @@ endef
 define Package/mount-utils
 $(call Package/util-linux/Default)
   TITLE:=Devices mount/unmounting utilities
+  DEPENDS+= +libblkid +libuuid
 endef
 
 define Package/mount-utils/description
@@ -67,8 +77,9 @@ endef
 
 define Package/swap-utils
 $(call Package/util-linux/Default)
-  TITLE:=Swap space management utilities
   SUBMENU:=disc
+  TITLE:=Swap space management utilities
+  DEPENDS+= +libblkid +libuuid
 endef
 
 define Package/swap-utils/description
@@ -87,11 +98,46 @@ 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 Package/script
+$(call Package/util-linux/Default)
+  TITLE:=Make typescript of terminal session
+  SUBMENU=Terminal
+endef
+
+define Package/script/description
+ Script makes a typescript of everything printed on your terminal.
+ http://linux.die.net/man/1/script
+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
+       $(MAKE) -C $(PKG_BUILD_DIR)/misc-utils script
 endef
 
 define Package/fdisk/install
@@ -104,13 +150,18 @@ 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/
 endef
 
 define Package/mount-utils/install
-       $(INSTALL_DIR) $(1)/sbin/
+       $(INSTALL_DIR) $(1)/bin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin
 endef
 
@@ -125,9 +176,29 @@ 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
+
+define Package/script/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/script $(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))
+$(eval $(call BuildPackage,script))