X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Futils%2Futil-linux%2FMakefile;h=c128b487e5ac9d31f75c74c2fa6670e6c51b0b96;hb=91a508d5bfd1fc865b57ce240d514cd233dcabeb;hp=0352d78fb436891c1363221967dd3b01f758e0d8;hpb=bf98d8125923b60502c7013ff2079e50a108e0ae;p=openwrt%2Fopenwrt.git diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 0352d78fb4..c128b487e5 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2014 OpenWrt.org +# Copyright (C) 2007-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,18 +8,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.24.1 +PKG_VERSION:=2.28 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.24 -PKG_MD5SUM:=88d46ae23ca599ac5af9cf96b531590f +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.28 +PKG_MD5SUM:=e534e6ccc49107e5d31c329af798ef7d -PKG_LICENSE:=GPLv2 LGPLv2.1 BSD-3c +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1 libuuid/COPYING Documentation/licenses/COPYING.BSD-3 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=libncurses + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_cal \ + CONFIG_PACKAGE_cfdisk \ + CONFIG_PACKAGE_setterm + PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk @@ -31,12 +36,15 @@ define Package/util-linux/Default endef CONFIGURE_ARGS += \ - --enable-new-mount \ - --with-ncurses \ + --disable-rpath \ --disable-tls \ - --without-udev + --disable-sulogin \ + --without-python \ + --without-udev \ + --without-readline \ + $(if $(CONFIG_PACKAGE_cal)$(CONFIG_PACKAGE_cfdisk)$(CONFIG_PACKAGE_setterm),--with-ncurses,--without-ncurses) -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) -std=gnu99 define Build/InstallDev $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -46,20 +54,28 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libfdisk/fdisk.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libsmartcols/smartcols.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/include/blkid $(CP) $(PKG_BUILD_DIR)/libblkid/src/blkid.h $(1)/usr/include/blkid + $(INSTALL_DIR) $(1)/usr/include/fdisk + $(CP) $(PKG_BUILD_DIR)/libfdisk/src/libfdisk.h $(1)/usr/include/fdisk $(INSTALL_DIR) $(1)/usr/include/libmount $(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount $(INSTALL_DIR) $(1)/usr/include/uuid $(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid + $(INSTALL_DIR) $(1)/usr/include/smartcols + $(CP) $(PKG_BUILD_DIR)/libsmartcols/src/libsmartcols.h $(1)/usr/include/smartcols $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.{a,so*} $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libfdisk.{a,so*} $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libmount.{a,so*} $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.{a,so*} $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.{a,so*} $(1)/usr/lib endef define Package/libblkid @@ -77,6 +93,18 @@ define Package/libblkid/description identifiers/serial numbers... endef +define Package/libfdisk +$(call Package/util-linux/Default) + DEPENDS:=+libuuid +libblkid + TITLE:=partition manipulating library + SECTION:=libs + CATEGORY:=Libraries +endef + +define Package/libfdisk/description + The libfdisk library is used for manipulating with partition tables. +endef + define Package/libmount $(call Package/util-linux/Default) DEPENDS:=+libblkid @@ -104,6 +132,17 @@ define Package/libuuid/description Foundation (OSF) Distributed Computing Environment (DCE) utility. endef +define Package/libsmartcols +$(call Package/util-linux/Default) + TITLE:=table or tree library + SECTION:=libs + CATEGORY:=Libraries +endef + +define Package/libsmartcols/description + The smartcols library is used to print tables and trees in a pretty way. +endef + define Package/agetty $(call Package/util-linux/Default) TITLE:=alternative Linux getty @@ -115,10 +154,22 @@ define Package/agetty/description /bin/login command endef +define Package/blkdiscard +$(call Package/util-linux/Default) + TITLE:=discard sectors on a device + SUBMENU=disc +endef + +define Package/blkdiscard/description + The blkdiscard is used to discard device sectors. This is useful for + solid-state drivers (SSDs) and thinly-provisioned storage. Unlike fstrim, + this command is used directly on the block device. +endef + define Package/blkid $(call Package/util-linux/Default) TITLE:=locate/print block device attributes - DEPENDS:= +libblkid + DEPENDS:= +libblkid +libuuid SUBMENU=disc endef @@ -140,7 +191,7 @@ endef define Package/cfdisk $(call Package/util-linux/Default) TITLE:=display or manipulate disk partition table - DEPENDS:= +libblkid +libncurses + DEPENDS:= +libblkid +libncurses +libsmartcols +libfdisk +libmount SUBMENU:=disc endef @@ -151,6 +202,7 @@ endef define Package/dmesg $(call Package/util-linux/Default) TITLE:=print or control the kernel ring buffer + DEPENDS:= +librt endef define Package/dmesg/description @@ -160,7 +212,7 @@ endef define Package/fdisk $(call Package/util-linux/Default) TITLE:=manipulate disk partition table - DEPENDS:= +libblkid + DEPENDS:= +libblkid +libsmartcols +libfdisk SUBMENU=disc endef @@ -230,6 +282,7 @@ endef define Package/losetup $(call Package/util-linux/Default) TITLE:=set up and control loop devices + DEPENDS:= +libsmartcols endef define Package/losetup/description @@ -240,7 +293,7 @@ endef define Package/lsblk $(call Package/util-linux/Default) TITLE:=list block devices - DEPENDS:= +libblkid + DEPENDS:= +libblkid +libmount +libsmartcols SUBMENU=disc endef @@ -261,7 +314,7 @@ endef define Package/mount-utils $(call Package/util-linux/Default) TITLE:=related (u)mount utilities - DEPENDS+= +libmount + DEPENDS+= +libmount +libsmartcols endef define Package/mount-utils/description @@ -278,6 +331,17 @@ define Package/namei/description files, directories, and so forth) endef +define Package/prlimit +$(call Package/util-linux/Default) + TITLE:=get and set process resource limits + DEPENDS:= +libsmartcols +endef + +define Package/prlimit/description + Given a process id and one or more resources, prlimit tries to retrieve + and/or modify the limits. +endef + define Package/rename $(call Package/util-linux/Default) TITLE:=rename files @@ -291,7 +355,7 @@ endef define Package/partx-utils $(call Package/util-linux/Default) TITLE:=inform kernel about the presence and numbering of on-disk partitions - DEPENDS:= +libblkid + DEPENDS:= +libblkid +libsmartcols SUBMENU=disc endef @@ -402,19 +466,29 @@ define Package/wipefs/description libblkid. endef +define Package/libfdisk/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libfdisk.so* $(1)/usr/lib/ +endef + define Package/libblkid/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.so* $(1)/usr/lib/ endef define Package/libmount/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so* $(1)/usr/lib/ +endef + +define Package/libsmartcols/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.so* $(1)/usr/lib/ endef define Package/libuuid/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so* $(1)/usr/lib/ endef define Package/agetty/install @@ -422,6 +496,11 @@ define Package/agetty/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/agetty $(1)/usr/sbin/ endef +define Package/blkdiscard/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/blkdiscard $(1)/usr/sbin/ +endef + define Package/blkid/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/blkid $(1)/usr/sbin/ @@ -437,6 +516,11 @@ define Package/cfdisk/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/cfdisk $(1)/usr/sbin/ endef +define Package/dmesg/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dmesg $(1)/usr/sbin/ +endef + define Package/fdisk/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/fdisk $(1)/usr/sbin/ @@ -474,7 +558,7 @@ endef define Package/losetup/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/losetup $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/losetup $(1)/usr/sbin/ endef define Package/lsblk/install @@ -499,6 +583,11 @@ define Package/namei/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/namei $(1)/usr/bin/ endef +define Package/prlimit/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/prlimit $(1)/usr/bin/ +endef + define Package/rename/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/rename $(1)/usr/bin/ @@ -559,9 +648,12 @@ define Package/wipefs/install endef $(eval $(call BuildPackage,libblkid)) +$(eval $(call BuildPackage,libfdisk)) $(eval $(call BuildPackage,libmount)) +$(eval $(call BuildPackage,libsmartcols)) $(eval $(call BuildPackage,libuuid)) $(eval $(call BuildPackage,agetty)) +$(eval $(call BuildPackage,blkdiscard)) $(eval $(call BuildPackage,blkid)) $(eval $(call BuildPackage,cal)) $(eval $(call BuildPackage,cfdisk)) @@ -578,6 +670,7 @@ $(eval $(call BuildPackage,lsblk)) $(eval $(call BuildPackage,mcookie)) $(eval $(call BuildPackage,mount-utils)) $(eval $(call BuildPackage,namei)) +$(eval $(call BuildPackage,prlimit)) $(eval $(call BuildPackage,rename)) $(eval $(call BuildPackage,partx-utils)) $(eval $(call BuildPackage,script-utils))