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/lvm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/lvm/Makefile') diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 6355f191a..a090ff62c 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.02.106 PKG_RELEASE:= 3 PKG_MD5SUM:= 77f84279fb649b3dc4edad1c6d1a1b0e PKG_DESCR:= logical volume management -PKG_SECTION:= fs +PKG_SECTION:= sys/fs PKG_DEPENDS:= libdevmapper libncurses PKG_BUILDDEP:= ncurses util-linux PKG_URL:= http://sourceware.org/lvm2/ @@ -20,7 +20,7 @@ PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER PKGSD_DEVICE_MAPPER:= device-mapper utility PKGSS_DEVICE_MAPPER:= libdevmapper PKGSD_LIBDEVMAPPER:= device-mapper library -PKGSC_LIBDEVMAPPER:= libs +PKGSC_LIBDEVMAPPER:= libs/misc DISTFILES:= LVM2.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} -- cgit v1.2.3