diff options
| -rw-r--r-- | package/util-linux-ng/patches/001-cris_avr32_label.patch | 11 | ||||
| -rw-r--r-- | package/util-linux/Makefile (renamed from package/util-linux-ng/Makefile) | 124 |
2 files changed, 72 insertions, 63 deletions
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 5b600623c..000000000 --- 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__) diff --git a/package/util-linux-ng/Makefile b/package/util-linux/Makefile index 0e1ac928b..1804979bf 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2010 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. @@ -7,14 +7,15 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=util-linux-ng -PKG_VERSION:=2.13.0.1 -PKG_RELEASE:=4 +PKG_NAME:=util-linux +PKG_VERSION:=2.20.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.13 -PKG_MD5SUM:=c841dc8743905c8f0db20c9db5094f57 +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.20 +PKG_MD5SUM:=fcd18041c5390178b1aadc2fd298bee8 +PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS=e2fsprogs libncurses include $(INCLUDE_DIR)/package.mk @@ -22,27 +23,34 @@ 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/ + URL:=http://www.kernel.org/pub/linux/utils/util-linux/ endef -define Package/fdisk +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 - SUBMENU=disc + DEPENDS:= +libncurses endef -define Package/fdisk/description +define Package/cfdisk/description This package contains a utility for managing disk partition tables. endef -define Package/cfdisk +define Package/fdisk $(call Package/util-linux/Default) - SUBMENU:=disc TITLE:=Partition table manipulation utility - DEPENDS:= +libncurses + SUBMENU=disc endef -define Package/cfdisk/description +define Package/fdisk/description This package contains a utility for managing disk partition tables. endef @@ -56,23 +64,31 @@ define Package/sfdisk/description This package contains a utility for managing disk partition tables using command-line only. endef -define Package/losetup +define Package/getopt $(call Package/util-linux/Default) - TITLE:=Loopback devices setup and control utility + TITLE:=Tool for parsing command parameters endef -define Package/losetup/description - This package contains a utility for managing loopback devices. +define Package/getopt/description + getopt is a program to help shell scripts parse command-line parameters. endef -define Package/mount-utils +define Package/hwclock $(call Package/util-linux/Default) - TITLE:=Devices mount/unmounting utilities - DEPENDS+= +libblkid +libuuid + TITLE:=Utilities for managing the hardware clock endef -define Package/mount-utils/description - This package contains utilities to mount/unmount devices. +define Package/hwclock/description + This package contains a utility for managing the hardware clock. +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/swap-utils @@ -89,13 +105,14 @@ define Package/swap-utils/description - swapoff endef -define Package/hwclock +define Package/mount-utils $(call Package/util-linux/Default) - TITLE:=Utilities for managing the hardware clock + TITLE:=Devices mount/unmounting utilities + DEPENDS+= +libblkid +libuuid endef -define Package/hwclock/description - This package contains a utility for managing the hardware clock. +define Package/mount-utils/description + This package contains utilities to mount/unmount devices. endef define Package/flock @@ -115,7 +132,7 @@ $(call Package/util-linux/Default) endef define Package/setterm/description - This package contains a utility for setting terminal attributes + This package contains a utility for setting terminal attributes. endef define Package/script @@ -126,28 +143,26 @@ 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)/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)/misc-utils setterm - $(MAKE) -C $(PKG_BUILD_DIR)/misc-utils script + $(MAKE) -C $(PKG_BUILD_DIR)/term-utils setterm script endef -define Package/fdisk/install +define Package/cfdisk/install $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/ endef -define Package/cfdisk/install +define Package/fdisk/install $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/sbin/ endef define Package/sfdisk/install @@ -155,14 +170,19 @@ define Package/sfdisk/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/ endef -define Package/losetup/install +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)/mount/losetup $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/ endef -define Package/mount-utils/install - $(INSTALL_DIR) $(1)/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin +define Package/losetup/install + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/sbin/ endef define Package/swap-utils/install @@ -171,9 +191,9 @@ define Package/swap-utils/install ln -sf swapon $(1)/sbin/swapoff endef -define Package/hwclock/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/ +define Package/mount-utils/install + $(INSTALL_DIR) $(1)/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin endef define Package/flock/install @@ -183,22 +203,22 @@ endef define Package/setterm/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/setterm $(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)/misc-utils/script $(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,mount-utils)) $(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)) |