diff options
Diffstat (limited to 'package/util-linux/Makefile')
| -rw-r--r-- | package/util-linux/Makefile | 55 |
1 files changed, 40 insertions, 15 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index f69ca613c..c1712235e 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,18 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.36 +PKG_VERSION:= 2.41.1 PKG_RELEASE:= 1 -PKG_HASH:= 9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1 +PKG_HASH:= be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 PKG_DESCR:= basic utilities PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses PKG_NEEDS:= threads -PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v$(PKG_VERSION)/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.41/ PKG_OPTS:= dev -PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT -PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT CFDISK MKFS +PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP LSFD MCOOKIE MOUNT +PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT LIBSMARTCOLS CFDISK MKFS +PKG_SUBPKGS+= SWITCHROOT PKGSD_LIBUUID:= uuid library PKGSC_LIBUUID:= libs/misc PKGSD_LIBBLKID:= blkid library @@ -24,9 +25,12 @@ PKGSD_LIBFDISK:= fdisk library PKGSC_LIBFDISK:= libs/misc PKGSD_LIBMOUNT:= mount library PKGSC_LIBMOUNT:= libs/misc +PKGSS_LIBMOUNT:= libblkid +PKGSD_LIBSMARTCOLS:= smartcols library +PKGSC_LIBSMARTCOLS:= libs/misc PKGSD_FDISK:= partition table manipulation utility PKGSC_FDISK:= sys/fs -PKGSS_FDISK:= libfdisk libblkid libuuid libncurses +PKGSS_FDISK:= libfdisk libblkid libuuid libncurses libscmartcols PKGSD_AGETTY:= getty utility PKGSC_AGETTY:= sys/utils PKGSS_AGETTY:= libncurses @@ -41,13 +45,19 @@ PKGSS_SWAP_UTILS:= libblkid PKGSC_SWAP_UTILS:= sys/fs PKGSD_LOSETUP:= loop devices management utilities PKGSC_LOSETUP:= sys/fs +PKGSD_LSFD:= modern lsof alternative program +PKGSC_LSFD:= sys/utils +PKGSS_LSFD:= libsmartcols libncurses PKGSD_MKFS:= filesystem creation frontend PKGSC_MKFS:= sys/fs PKGSD_MOUNT:= mount/umount utilities PKGSS_MOUNT:= libblkid libmount libuuid libncurses PKGSC_MOUNT:= sys/fs +PKGSD_SWITCHROOT:= switch_root utility +PKGSC_SWITCHROOT:= sys/utils PKGSD_MCOOKIE:= generate magic cookies for xauth PKGSC_MCOOKIE:= x11/utils +PKGSS_MCOOKIE:= libncurses include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -59,13 +69,16 @@ $(eval $(call PKG_template,CFDISK,cfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP $(eval $(call PKG_template,SFDISK,sfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_SFDISK),$(PKGSC_SFDISK))) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_SWAP_UTILS),$(PKGSD_SWAP_UTILS),$(PKGSC_SWAP_UTILS))) $(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LOSETUP),$(PKGSD_LOSETUP),$(PKGSC_LOSETUP))) +$(eval $(call PKG_template,LSFD,lsfd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LSFD),$(PKGSD_LSFD),$(PKGSC_LSFD))) $(eval $(call PKG_template,MKFS,mkfs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKFS),$(PKGSD_MKFS),$(PKGSC_MKFS))) $(eval $(call PKG_template,MOUNT,mount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) +$(eval $(call PKG_template,SWITCHROOT,switchroot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) $(eval $(call PKG_template,MCOOKIE,mcookie,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_MCOOKIE),$(PKGSC_MCOOKIE))) $(eval $(call PKG_template,LIBUUID,libuuid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBUUID),$(PKGSC_LIBUUID),$(PKG_OPTS))) $(eval $(call PKG_template,LIBBLKID,libblkid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBBLKID),$(PKGSC_LIBBLKID),$(PKG_OPTS))) $(eval $(call PKG_template,LIBFDISK,libfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBFDISK),$(PKGSC_LIBFDISK),$(PKG_OPTS))) $(eval $(call PKG_template,LIBMOUNT,libmount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBMOUNT),$(PKGSC_LIBMOUNT),$(PKG_OPTS))) +$(eval $(call PKG_template,LIBSMARTCOLS,libsmartcols,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBSMARTCOLS),$(PKGSC_LIBSMARTCOLS),$(PKG_OPTS))) TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK TARGET_LDFLAGS+= -ltinfo @@ -89,21 +102,23 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --disable-cramfs \ --disable-login \ --disable-eject \ - --disable-switch_root \ --disable-nsenter \ --disable-unshare \ --disable-wall \ + --disable-liblastlog2 \ --disable-symvers \ --without-python \ --without-systemd \ --without-user \ + --enable-switch_root \ --enable-libfdisk \ --enable-libuuid \ --enable-libblkid \ --enable-libmount - -ifeq ($(ADK_PACKAGE_FDISK)$(ADK_PACKAGE_AGETTY)$(ADK_PACKAGE_SFDISK)$(ADK_PACKAGE_CFDISK)$(ADK_PACKAGE_MKFS)$(ADK_PACKAGE_MOUNT)$(ADK_PACKAGE_SWAP_UTILS)$(ADK_PACKAGE_MCOOKIE),) -CONFIGURE_ARGS+= --disable-all-programs +ifneq (${ADK_PACKAGE_LSFD},) +CONFIGURE_ARGS+= --enable-lsfd +else +CONFIGURE_ARGS+= --disable-lsfd endif TARGET_CFLAGS+= -fPIC @@ -112,10 +127,8 @@ HOST_CONFIGURE_ARGS+= --enable-libblkid \ --enable-libuuid \ --enable-libmount \ --disable-all-programs \ - --disable-use-tty-group -ifneq ($(OS_FOR_BUILD),Darwin) -HOST_CONFIGURE_ARGS+= --enable-libuuid -endif + --disable-use-tty-group \ + --enable-libuuid fdisk-install: $(INSTALL_DIR) $(IDIR_FDISK)/usr/sbin @@ -137,6 +150,10 @@ losetup-install: $(INSTALL_DIR) $(IDIR_LOSETUP)/usr/sbin $(CP) $(WRKINST)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin +lsfd-install: + $(INSTALL_DIR) $(IDIR_LSFD)/usr/bin + $(CP) $(WRKINST)/usr/bin/lsfd $(IDIR_LSFD)/usr/bin + swap-utils-install: $(INSTALL_DIR) $(IDIR_SWAP_UTILS)/usr/sbin $(CP) $(WRKINST)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin @@ -150,6 +167,10 @@ mount-install: $(INSTALL_DIR) $(IDIR_MOUNT)/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/{u,}mount $(IDIR_MOUNT)/bin +switchroot-install: + $(INSTALL_DIR) $(IDIR_SWITCHROOT)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/switch_root $(IDIR_SWITCHROOT)/sbin + mcookie-install: $(INSTALL_DIR) $(IDIR_MCOOKIE)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/usr/bin @@ -165,11 +186,15 @@ libblkid-install: libfdisk-install: $(INSTALL_DIR) $(IDIR_LIBFDISK)/usr/lib $(CP) $(WRKINST)/usr/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib - $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib libmount-install: $(INSTALL_DIR) $(IDIR_LIBMOUNT)/usr/lib $(CP) $(WRKINST)/usr/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib +libsmartcols-install: + $(INSTALL_DIR) $(IDIR_LIBSMARTCOLS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBSMARTCOLS)/usr/lib + + include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk |