summaryrefslogtreecommitdiff
path: root/package/lvm
diff options
context:
space:
mode:
Diffstat (limited to 'package/lvm')
-rw-r--r--package/lvm/Makefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 981aa21b6..3dc4e3802 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -5,21 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
PKG_VERSION:= 2.02.80
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2
PKG_DESCR:= logical volume management
PKG_SECTION:= fs
PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
+PKG_LIBNAME:= libdevmapper
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER LIBDEVMAPPER_DEV
+PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER
PKGSD_DEVICE_MAPPER:= device-mapper utility
PKGSS_DEVICE_MAPPER:= libdevmapper
PKGSD_LIBDEVMAPPER:= device-mapper library
PKGSC_LIBDEVMAPPER:= libs
-PKGSD_LIBDEVMAPPER_DEV:=device-mapper headers
-PKGSC_LIBDEVMAPPER_DEV:=devel
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
@@ -28,8 +28,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER}))
-$(eval $(call PKG_template,LIBDEVMAPPER_DEV,libdevmapper-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER_DEV},${PKGSC_LIBDEVMAPPER_DEV}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER},${PKG_OPTS}))
CONFIGURE_ARGS+= --with-user="" --with-group="" \
--with-optimisation="" \
@@ -44,11 +43,6 @@ libdevmapper-install:
${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
${IDIR_LIBDEVMAPPER}/usr/lib
-libdevmapper-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBDEVMAPPER_DEV}/usr/include
-
device-mapper-install:
${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \