X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Futils%2Futil-linux%2FMakefile;h=17f22e1ae4e5ff3387498d02673b976578279ad4;hp=877ccc500abc9741bb443c5eb90df72f4753dd30;hb=480a6aec98f005a6102ba35bead7c6d008212a9a;hpb=bec9d38fa4ed4dcf13230fe6b91b4ef81306accc diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 877ccc500a..17f22e1ae4 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,61 +8,42 @@ 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_HASH:=395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb 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_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:=0 + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_cal \ + CONFIG_PACKAGE_cfdisk \ + CONFIG_PACKAGE_setterm -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=libncurses PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/util-linux/Default SECTION:=utils CATEGORY:=Utilities + DEPENDS:= +librt URL:=http://www.kernel.org/pub/linux/utils/util-linux/ endef -CONFIGURE_ARGS += \ - --enable-new-mount \ - --with-ncurses \ - --disable-tls \ - --disable-sulogin \ - --without-udev - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) \ - BUILDCC="$(HOSTCC)" \ - DESTDIR="$(1)" \ - installdirs install-data - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/libmount/mount.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/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/lib - $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.{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 -endef - define Package/libblkid $(call Package/util-linux/Default) DEPENDS:=+libuuid @@ -78,6 +59,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 @@ -105,6 +98,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 @@ -116,11 +120,23 @@ 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 - SUBMENU=disc + TITLE:=locate and print block device attributes + DEPENDS:= +libblkid +libuuid + SUBMENU=Disc endef define Package/blkid/description @@ -141,8 +157,8 @@ endef define Package/cfdisk $(call Package/util-linux/Default) TITLE:=display or manipulate disk partition table - DEPENDS:= +libblkid +libncurses - SUBMENU:=disc + DEPENDS:= +libblkid +libncurses +libsmartcols +libfdisk +libmount + SUBMENU:=Disc endef define Package/cfdisk/description @@ -152,7 +168,6 @@ endef define Package/dmesg $(call Package/util-linux/Default) TITLE:=print or control the kernel ring buffer - DEPENDS:= +librt endef define Package/dmesg/description @@ -162,8 +177,8 @@ endef define Package/fdisk $(call Package/util-linux/Default) TITLE:=manipulate disk partition table - DEPENDS:= +libblkid - SUBMENU=disc + DEPENDS:= +libblkid +libsmartcols +libfdisk + SUBMENU=Disc endef define Package/fdisk/description @@ -174,7 +189,7 @@ define Package/findfs $(call Package/util-linux/Default) TITLE:=find a filesystem by label or UUID DEPENDS:= +libblkid - SUBMENU=disc + SUBMENU=Disc endef define Package/findfs/description @@ -232,6 +247,7 @@ endef define Package/losetup $(call Package/util-linux/Default) TITLE:=set up and control loop devices + DEPENDS:= +libsmartcols endef define Package/losetup/description @@ -242,8 +258,8 @@ endef define Package/lsblk $(call Package/util-linux/Default) TITLE:=list block devices - DEPENDS:= +libblkid +libmount - SUBMENU=disc + DEPENDS:= +libblkid +libmount +libsmartcols + SUBMENU=Disc endef define Package/lsblk/description @@ -263,7 +279,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 @@ -280,6 +296,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 @@ -293,8 +320,8 @@ endef define Package/partx-utils $(call Package/util-linux/Default) TITLE:=inform kernel about the presence and numbering of on-disk partitions - DEPENDS:= +libblkid - SUBMENU=disc + DEPENDS:= +libblkid +libsmartcols + SUBMENU=Disc endef define Package/partx-utils/description @@ -326,7 +353,8 @@ endef define Package/sfdisk $(call Package/util-linux/Default) TITLE:=partition table manipulator for Linux - SUBMENU=disc + SUBMENU=Disc + DEPENDS:= +libblkid +libfdisk +libsmartcols endef define Package/sfdisk/description @@ -338,7 +366,7 @@ define Package/swap-utils $(call Package/util-linux/Default) TITLE:=swap space management utilities DEPENDS+= +libblkid - SUBMENU:=disc + SUBMENU:=Filesystem endef define Package/swap-utils/description @@ -395,7 +423,7 @@ define Package/wipefs $(call Package/util-linux/Default) TITLE:=wipe a signature from a device DEPENDS:= +libblkid - SUBMENU:=disc + SUBMENU:=Disc endef define Package/wipefs/description @@ -404,171 +432,245 @@ define Package/wipefs/description libblkid. endef +CONFIGURE_ARGS += \ + --disable-use-tty-group \ + --disable-rpath \ + --disable-tls \ + --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) -std=gnu99 + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/blkid.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fdisk.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mount.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/smartcols.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/uuid.pc $(1)/usr/lib/pkgconfig + + $(INSTALL_DIR) $(1)/usr/include/blkid + $(CP) $(PKG_INSTALL_DIR)/usr/include/blkid/blkid.h $(1)/usr/include/blkid + $(INSTALL_DIR) $(1)/usr/include/libfdisk + $(CP) $(PKG_INSTALL_DIR)/usr/include/libfdisk/libfdisk.h $(1)/usr/include/libfdisk + $(INSTALL_DIR) $(1)/usr/include/libmount + $(CP) $(PKG_INSTALL_DIR)/usr/include/libmount/libmount.h $(1)/usr/include/libmount + $(INSTALL_DIR) $(1)/usr/include/uuid + $(CP) $(PKG_INSTALL_DIR)/usr/include/uuid/uuid.h $(1)/usr/include/uuid + $(INSTALL_DIR) $(1)/usr/include/libsmartcols + $(CP) $(PKG_INSTALL_DIR)/usr/include/libsmartcols/libsmartcols.h $(1)/usr/include/libsmartcols + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib + + $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so + $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so + $(LN) libmount.so.1 $(1)/usr/lib/libmount.so + $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so + $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so +endef + + +define Package/libfdisk/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib/ + $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so +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_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib/ + $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so 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_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib/ + $(LN) libmount.so.1 $(1)/usr/lib/libmount.so +endef + +define Package/libsmartcols/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib/ + $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so 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_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib/ + $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so endef define Package/agetty/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/agetty $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/agetty $(1)/usr/sbin/ +endef + +define Package/blkdiscard/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkdiscard $(1)/usr/sbin/ endef define Package/blkid/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/blkid $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkid $(1)/usr/sbin/ endef define Package/cal/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/cal $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cal $(1)/usr/bin/ endef define Package/cfdisk/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/cfdisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/cfdisk $(1)/usr/sbin/ endef define Package/dmesg/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/dmesg $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmesg $(1)/usr/bin/ endef define Package/fdisk/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/fdisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fdisk $(1)/usr/sbin/ endef define Package/findfs/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/findfs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/findfs $(1)/usr/sbin/ endef define Package/flock/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/flock $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/flock $(1)/usr/bin/ endef define Package/getopt/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getopt $(1)/usr/bin/ endef define Package/hwclock/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hwclock $(1)/usr/sbin/ endef define Package/logger/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/logger $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/ endef define Package/look/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/look $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/look $(1)/usr/bin/ endef define Package/losetup/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/losetup $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/losetup $(1)/usr/sbin/ endef define Package/lsblk/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/lsblk $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsblk $(1)/usr/bin/ endef define Package/mcookie/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/mcookie $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mcookie $(1)/usr/bin/ endef define Package/mount-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{u,}mount $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/mountpoint $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/findmnt $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{u,}mount $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mountpoint $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/findmnt $(1)/usr/bin/ endef define Package/namei/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/namei $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/namei $(1)/usr/bin/ +endef + +define Package/prlimit/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prlimit $(1)/usr/bin/ endef define Package/rename/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/rename $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rename $(1)/usr/bin/ endef define Package/partx-utils/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/partx $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/addpart $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/delpart $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/partx $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/addpart $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/delpart $(1)/usr/sbin/ endef define Package/script-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/script $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/scriptreplay $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/script $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scriptreplay $(1)/usr/bin/ endef define Package/setterm/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/setterm $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/setterm $(1)/usr/bin/ endef define Package/sfdisk/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sfdisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sfdisk $(1)/usr/sbin/ endef define Package/swap-utils/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/mkswap $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/swaplabel $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkswap $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/swaplabel $(1)/usr/sbin/ endef define Package/uuidd/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/uuidd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin//uuidd $(1)/usr/sbin/ endef define Package/uuidgen/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/uuidgen $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin//uuidgen $(1)/usr/bin/ endef define Package/wall/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wall $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wall $(1)/usr/bin/ endef define Package/whereis/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/whereis $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/whereis $(1)/usr/bin/ endef define Package/wipefs/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/wipefs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/wipefs $(1)/usr/sbin/ 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)) @@ -585,6 +687,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))