diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 10:25:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 10:25:35 +0200 |
| commit | 0f1fb71b374c9af0bafb373c2135dd5829e5f132 (patch) | |
| tree | 4fa61dfffd031c2b9b6c8d3588c2294878fdc75c /package/util-linux/Makefile | |
| parent | 76c1916cac0994987d1dfefca57e98ddd1f48129 (diff) | |
| parent | 068293a4908cafa95898b53ef97282ad8294c1cf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/util-linux/Makefile')
| -rw-r--r-- | package/util-linux/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 76d482629..2f84a4d63 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux PKG_VERSION:= 2.23.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= b39fde897334a4858bb2098edcce5b3f PKG_DESCR:= Linux utilities PKG_SECTION:= fs @@ -18,13 +18,15 @@ PKG_ARCH_DEPENDS:= !m68k DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT -PKG_SUBPKGS+= LIBUUID LIBBLKID LIBUUID_DEV +PKG_SUBPKGS+= LIBUUID LIBBLKID LIBUUID_DEV LIBMOUNT PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs PKGSD_LIBUUID_DEV:= UUID headers PKGSC_LIBUUID_DEV:= devel PKGSD_LIBBLKID:= BLKID library PKGSC_LIBBLKID:= libs +PKGSD_LIBMOUNT:= Mount library +PKGSC_LIBMOUNT:= libs PKGSD_FDISK:= Partition table manipulation utility PKGSD_SFDISK:= Scriptable Partition table manipulation utility PKGSD_SWAP_UTILS:= Swap space management utilities @@ -32,7 +34,7 @@ PKGSS_SWAP_UTILS:= libblkid PKGSD_LOSETUP:= Loop devices management utilities PKGSS_LOSETUP:= kmod-blk-dev-loop PKGSD_MOUNT:= mount/umount utilities -PKGSS_MOUNT:= libblkid +PKGSS_MOUNT:= libblkid libmount libuuid PKGSC_MOUNT:= fs PKGSD_MCOOKIE:= Generate magic cookies for xauth PKGSC_MCOOKIE:= x11/apps @@ -43,11 +45,12 @@ $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKG_SECTION})) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKG_SECTION})) $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION})) -$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MOUNT},${PKG_SECTION})) +$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKG_SECTION})) $(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})) $(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV})) $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) +$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT})) CONFIGURE_ENV+= have_scanf_alloc_modifier=yes \ scanf_cv_alloc_modifier=ms @@ -88,8 +91,8 @@ swap-utils-install: ${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin mount-install: - ${INSTALL_DIR} ${IDIR_MOUNT}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/usr/bin + ${INSTALL_DIR} ${IDIR_MOUNT}/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/bin mcookie-install: ${INSTALL_DIR} ${IDIR_MCOOKIE}/usr/bin @@ -107,4 +110,8 @@ libblkid-install: ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib ${CP} ${WRKINST}/usr/lib/libblkid.so* ${IDIR_LIBBLKID}/usr/lib +libmount-install: + ${INSTALL_DIR} ${IDIR_LIBMOUNT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libmount.so* ${IDIR_LIBMOUNT}/usr/lib + include ${TOPDIR}/mk/pkg-bottom.mk |