util-linux: update to 2.40.2, add lsfd subpackage

1 files changed, 23 insertions, 11 deletions

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 7d2510443..85c0397e8 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,18 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.39.3
+PKG_VERSION:=		2.40.2
 PKG_RELEASE:=		1
-PKG_HASH:=		7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+PKG_HASH:=		d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3
 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/v2.39/
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.40/
 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
 PKGSD_LIBUUID:=		uuid library
 PKGSC_LIBUUID:=		libs/misc
 PKGSD_LIBBLKID:=	blkid library
@@ -24,9 +24,11 @@ PKGSD_LIBFDISK:=	fdisk library
 PKGSC_LIBFDISK:=	libs/misc
 PKGSD_LIBMOUNT:=	mount library
 PKGSC_LIBMOUNT:=	libs/misc
+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,6 +43,9 @@ 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
@@ -59,6 +64,7 @@ $(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,MCOOKIE,mcookie,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_MCOOKIE),$(PKGSC_MCOOKIE)))
@@ -66,6 +72,7 @@ $(eval $(call PKG_template,LIBUUID,libuuid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_D
 $(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
@@ -93,6 +100,7 @@ CONFIGURE_ARGS+=	--exec-prefix=/usr \
 			--disable-nsenter \
 			--disable-unshare \
 			--disable-wall \
+			--disable-liblastlog2 \
 			--disable-symvers \
 			--without-python \
 			--without-systemd \
@@ -102,10 +110,6 @@ CONFIGURE_ARGS+=	--exec-prefix=/usr \
 			--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
-endif
-
 TARGET_CFLAGS+=		-fPIC
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 HOST_CONFIGURE_ARGS+=	--enable-libblkid \
@@ -137,6 +141,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
@@ -165,11 +173,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