diff options
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/Makefile | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 8d8e113ef..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.40.2 -PKG_RELEASE:= 2 -PKG_HASH:= d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 +PKG_VERSION:= 2.41.1 +PKG_RELEASE:= 1 +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/v2.40/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.41/ PKG_OPTS:= dev 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,6 +25,7 @@ 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 @@ -51,6 +53,8 @@ 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 @@ -68,6 +72,7 @@ $(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS $(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))) @@ -97,7 +102,6 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --disable-cramfs \ --disable-login \ --disable-eject \ - --disable-switch_root \ --disable-nsenter \ --disable-unshare \ --disable-wall \ @@ -106,6 +110,7 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --without-python \ --without-systemd \ --without-user \ + --enable-switch_root \ --enable-libfdisk \ --enable-libuuid \ --enable-libblkid \ @@ -162,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 |