-#
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
-PKG_VERSION:=2.12r
-PKG_RELEASE:=2
+PKG_VERSION:=2.20.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/
-PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.20
+PKG_MD5SUM:=fcd18041c5390178b1aadc2fd298bee8
+
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS=e2fsprogs libncurses
+PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
define Package/util-linux/Default
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=@!LINUX_2_6_ETRAX
URL:=http://www.kernel.org/pub/linux/utils/util-linux/
endef
-define Package/fdisk
- $(call Package/util-linux/Default)
+CONFIGURE_VARS += \
+ scanf_cv_type_modifier="ms"
+
+CONFIGURE_ARGS += \
+ --disable-nls \
+ --disable-tls
+
+define Package/cfdisk
+$(call Package/util-linux/Default)
+ SUBMENU:=disc
TITLE:=Partition table manipulation utility
- DESCRIPTION:=\
- This package contains a utility for managing disk partition tables.
- URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+ DEPENDS:= +libncurses
endef
-define Package/cfdisk
- $(call Package/util-linux/Default)
+define Package/cfdisk/description
+ This package contains a utility for managing disk partition tables.
+endef
+
+define Package/fdisk
+$(call Package/util-linux/Default)
TITLE:=Partition table manipulation utility
- DEPENDS+= +libncurses
- DESCRIPTION:=\
- This package contains a 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/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/getopt
+$(call Package/util-linux/Default)
+ TITLE:=Tool for parsing command parameters
+endef
+
+define Package/getopt/description
+ getopt is a program to help shell scripts parse command-line parameters.
+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/losetup
- $(call Package/util-linux/Default)
+$(call Package/util-linux/Default)
TITLE:=Loopback devices setup and control utility
- DESCRIPTION:=\
- This package contains a 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)
+ SUBMENU:=disc
TITLE:=Swap space management utilities
- DESCRIPTION:=\
- This package contains a collection of tools for managing swap space: \\\
- - mkswap\\\
- - swapon\\\
- - swapoff
+ DEPENDS+= +libblkid +libuuid
endef
-define Package/hwclock
- $(call Package/util-linux/Default)
- TITLE:=Utilities for managing the hardware clock
- DESCRIPTION:=\
- This package contains a utility for managing the hardware clock
+define Package/swap-utils/description
+ This package contains a collection of tools for managing swap space:
+ - mkswap
+ - swapon
+ - swapoff
endef
-define Build/Configure
- # this is NOT GNU configure!
- ( cd $(PKG_BUILD_DIR); \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CPPFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- ./configure \
- );
+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/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.
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- OPT="$(TARGET_CFLAGS)" \
- INSTALLSUID="install -m 4755" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR)/disk-utils mkswap
+ $(MAKE) -C $(PKG_BUILD_DIR)/fdisk cfdisk fdisk sfdisk
+ $(MAKE) -C $(PKG_BUILD_DIR)/getopt getopt
+ $(MAKE) -C $(PKG_BUILD_DIR)/hwclock hwclock
+ $(MAKE) -C $(PKG_BUILD_DIR)/mount losetup mount swapon umount
+ $(MAKE) -C $(PKG_BUILD_DIR)/sys-utils flock
+ $(MAKE) -C $(PKG_BUILD_DIR)/term-utils setterm script
endef
-define Package/Template
- @if [ \! -f "$(PKG_INSTALL_DIR)/$(1)" ]; then \
- rm -f $(PKG_BUILD_DIR)/.built; \
- $(MAKE) $(PKG_BUILD_DIR)/.built; \
- fi
- $(INSTALL_DIR) $(2)
- $(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/
+define Package/cfdisk/install
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/sbin/
endef
define Package/fdisk/install
- $(call Package/Template,sbin/fdisk,$(1)/usr/sbin)
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/sbin/
endef
-define Package/cfdisk/install
- $(call Package/Template,sbin/cfdisk,$(1)/usr/sbin)
+define Package/sfdisk/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/
+endef
+
+define Package/getopt/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt/getopt $(1)/usr/bin/
+endef
+
+define Package/hwclock/install
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/
endef
define Package/losetup/install
- $(call Package/Template,sbin/losetup,$(1)/usr/sbin)
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/sbin/
endef
define Package/swap-utils/install
- $(call Package/Template,sbin/mkswap,$(1)/usr/sbin)
- $(call Package/Template,sbin/swapon,$(1)/usr/sbin)
- $(call Package/Template,sbin/swapoff,$(1)/usr/sbin)
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/sbin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/.libs/swapon $(1)/sbin/
+ ln -sf swapon $(1)/sbin/swapoff
endef
-define Package/hwclock/install
- $(call Package/Template,sbin/hwclock,$(1)/usr/sbin)
+define Package/mount-utils/install
+ $(INSTALL_DIR) $(1)/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/.libs/{u,}mount $(1)/bin
+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)/term-utils/setterm $(1)/usr/bin/
+endef
+
+define Package/script/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/script $(1)/usr/bin/
endef
-$(eval $(call BuildPackage,fdisk))
$(eval $(call BuildPackage,cfdisk))
+$(eval $(call BuildPackage,fdisk))
+$(eval $(call BuildPackage,sfdisk))
+$(eval $(call BuildPackage,getopt))
+$(eval $(call BuildPackage,hwclock))
$(eval $(call BuildPackage,losetup))
$(eval $(call BuildPackage,swap-utils))
-$(eval $(call BuildPackage,hwclock))
+$(eval $(call BuildPackage,mount-utils))
+$(eval $(call BuildPackage,flock))
+$(eval $(call BuildPackage,setterm))
+$(eval $(call BuildPackage,script))
projects / openwrt.git / blobdiff