aboutsummaryrefslogtreecommitdiffstats
path: root/package/util-linux-ng
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:48 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:48 +0000
commit5f332bf12cf7b1d68d16e404094e5da8a0fe2765 (patch)
treea02fda271155d5118baf118ef3962cc330e2aed5 /package/util-linux-ng
parentdcd98a5d3a4dc98dd98e692eca5c9ede7e284e5a (diff)
downloadupstream-5f332bf12cf7b1d68d16e404094e5da8a0fe2765.tar.gz
upstream-5f332bf12cf7b1d68d16e404094e5da8a0fe2765.tar.bz2
upstream-5f332bf12cf7b1d68d16e404094e5da8a0fe2765.zip
util-linux: move and update
This patch makes several changes with util-linux-ng package: * moves it to util-linux (upstream name) * bumps it to last stable version 2.20.1 (was 2.13.0.1) * adds new package getopt * sorts packages inside Makefile * removes patch, it has been applied upstream I would also like to maintain this package. Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> SVN-Revision: 31178
Diffstat (limited to 'package/util-linux-ng')
-rw-r--r--package/util-linux-ng/Makefile204
-rw-r--r--package/util-linux-ng/patches/001-cris_avr32_label.patch11
2 files changed, 0 insertions, 215 deletions
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
deleted file mode 100644
index 0e1ac928be..0000000000
--- a/package/util-linux-ng/Makefile
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=util-linux-ng
-PKG_VERSION:=2.13.0.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=e2fsprogs libncurses
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/util-linux/Default
- SECTION:=utils
- CATEGORY:=Utilities
- URL:=http://www.kernel.org/pub/linux/utils/util-linux-ng/
-endef
-
-define Package/fdisk
-$(call Package/util-linux/Default)
- TITLE:=Partition table manipulation utility
- 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)
- SUBMENU:=disc
- TITLE:=Partition table manipulation utility
- DEPENDS:= +libncurses
-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
-endef
-
-define Package/losetup/description
- This package contains a utility for managing loopback devices.
-endef
-
-define Package/mount-utils
-$(call Package/util-linux/Default)
- TITLE:=Devices mount/unmounting utilities
- DEPENDS+= +libblkid +libuuid
-endef
-
-define Package/mount-utils/description
- This package contains utilities to mount/unmount devices.
-endef
-
-define Package/swap-utils
-$(call Package/util-linux/Default)
- SUBMENU:=disc
- TITLE:=Swap space management utilities
- DEPENDS+= +libblkid +libuuid
-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 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 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
- $(INSTALL_DIR) $(1)/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/sbin/
-endef
-
-define Package/cfdisk/install
- $(INSTALL_DIR) $(1)/sbin
- $(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)/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin
-endef
-
-define Package/swap-utils/install
- $(INSTALL_DIR) $(1)/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(PKG_BUILD_DIR)/mount/swapon $(1)/sbin/
- ln -sf swapon $(1)/sbin/swapoff
-endef
-
-define Package/hwclock/install
- $(INSTALL_DIR) $(1)/sbin
- $(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))
diff --git a/package/util-linux-ng/patches/001-cris_avr32_label.patch b/package/util-linux-ng/patches/001-cris_avr32_label.patch
deleted file mode 100644
index 5b600623c4..0000000000
--- a/package/util-linux-ng/patches/001-cris_avr32_label.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fdisk/fdiskbsdlabel.h
-+++ b/fdisk/fdiskbsdlabel.h
-@@ -46,7 +46,7 @@
-
- #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
-
--#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__)
-+#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) || defined (__cris__) || defined(__avr32__)
- #define BSD_LABELSECTOR 1
- #define BSD_LABELOFFSET 0
- #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)