From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/util-linux/Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 129584e6d..accc99c5c 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= util-linux PKG_VERSION:= 2.24.2 PKG_RELEASE:= 3 PKG_MD5SUM:= 3f191727a0d28f7204b755cf1b6ea0aa -PKG_DESCR:= basic Linux utilities -PKG_SECTION:= core +PKG_DESCR:= basic utilities +PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses pam PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.24/ PKG_NOPARALLEL:= 1 @@ -19,29 +19,29 @@ PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT PKG_SUBPKGS+= LIBUUID LIBBLKID LIBMOUNT SU CFDISK PKGSD_LIBUUID:= uuid library -PKGSC_LIBUUID:= libs +PKGSC_LIBUUID:= libs/misc PKGSD_LIBBLKID:= blkid library -PKGSC_LIBBLKID:= libs +PKGSC_LIBBLKID:= libs/misc PKGSD_LIBMOUNT:= mount library -PKGSC_LIBMOUNT:= libs +PKGSC_LIBMOUNT:= libs/misc PKGSD_FDISK:= partition table manipulation utility -PKGSC_FDISK:= fs +PKGSC_FDISK:= sys/fs PKGSD_SFDISK:= scriptable partition table manipulation utility -PKGSC_SFDISK:= fs +PKGSC_SFDISK:= sys/fs PKGSD_CFDISK:= partition table manipulation utility -PKGSC_CFDISK:= fs +PKGSC_CFDISK:= sys/fs PKGSD_SU:= switch user utility -PKGSC_SU:= misc +PKGSC_SU:= sys/misc PKGSD_SWAP_UTILS:= swap space management utilities PKGSS_SWAP_UTILS:= libblkid -PKGSC_SWAP_UTILS:= fs +PKGSC_SWAP_UTILS:= sys/fs PKGSD_LOSETUP:= loop devices management utilities -PKGSC_LOSETUP:= fs +PKGSC_LOSETUP:= sys/fs PKGSD_MOUNT:= mount/umount utilities PKGSS_MOUNT:= libblkid libmount libuuid libncurses -PKGSC_MOUNT:= fs +PKGSC_MOUNT:= sys/fs PKGSD_MCOOKIE:= generate magic cookies for xauth -PKGSC_MCOOKIE:= x11/apps +PKGSC_MCOOKIE:= x11/utils include ${TOPDIR}/mk/package.mk -- cgit v1.2.3