diff options
Diffstat (limited to 'package/lvm')
-rw-r--r-- | package/lvm/Makefile | 13 | ||||
-rw-r--r-- | package/lvm/patches/patch-Makefile_in | 20 | ||||
-rw-r--r-- | package/lvm/patches/patch-make_tmpl_in | 13 |
3 files changed, 38 insertions, 8 deletions
diff --git a/package/lvm/Makefile b/package/lvm/Makefile index b45a262e1..67ae4d6cc 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.79 +PKG_VERSION:= 2.02.80 PKG_RELEASE:= 1 -PKG_MD5SUM:= e6929251a90b0b626c024942a242f337 +PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2 PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses @@ -31,15 +31,16 @@ CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ --with-lvm1=none -post-install: - # lvm +lvm-install: ${INSTALL_DIR} ${IDIR_LVM}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm - # libdevmapper + +libdevmapper-install: ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ ${IDIR_LIBDEVMAPPER}/usr/lib - # device-mapper + +device-mapper-install: ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ ${IDIR_DEVICE_MAPPER}/usr/sbin diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in new file mode 100644 index 000000000..22b0626e5 --- /dev/null +++ b/package/lvm/patches/patch-Makefile_in @@ -0,0 +1,20 @@ +--- LVM2.2.02.79.orig/Makefile.in 2010-11-22 22:39:47.000000000 +0100 ++++ LVM2.2.02.79/Makefile.in 2011-01-07 20:54:18.000000000 +0100 +@@ -16,7 +16,7 @@ srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ + +-SUBDIRS = doc include man scripts ++SUBDIRS = include man scripts + + ifeq ("@UDEV_RULES@", "yes") + SUBDIRS += udev +@@ -33,7 +33,7 @@ ifeq ("@APPLIB@", "yes") + endif + + ifeq ($(MAKECMDGOALS),distclean) +- SUBDIRS = doc include man scripts \ ++ SUBDIRS = include man scripts \ + lib tools daemons libdm \ + udev po liblvm test/api test + endif diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in index 43bd07008..f5286dfa4 100644 --- a/package/lvm/patches/patch-make_tmpl_in +++ b/package/lvm/patches/patch-make_tmpl_in @@ -1,5 +1,14 @@ ---- LVM2.2.02.79.orig/make.tmpl.in 2010-11-05 17:18:38.000000000 +0100 -+++ LVM2.2.02.79/make.tmpl.in 2010-12-26 22:15:11.000000000 +0100 +--- LVM2.2.02.80.orig/make.tmpl.in 2011-01-10 14:00:53.000000000 +0100 ++++ LVM2.2.02.80/make.tmpl.in 2011-01-11 11:39:53.000000000 +0100 +@@ -33,7 +33,7 @@ LIBS = @LIBS@ + # Extra libraries always linked with static binaries + STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) + DEFS += @DEFS@ +-CFLAGS += @CFLAGS@ ++CFLAGS = @CFLAGS@ + CLDFLAGS += @CLDFLAGS@ + LDDEPS += @LDDEPS@ + LDFLAGS += @LDFLAGS@ @@ -322,7 +322,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI $(LN_S) -f $(<F) $@ |