diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 14:26:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 14:26:13 +0100 |
commit | abf607b563f8ab66536120681cc43230a3c053ce (patch) | |
tree | 7cf17ef1306ec224b501d6aa0809013d191dd564 /package/lvm | |
parent | 7c41bd04b223bb739bc87542d9414e5de783f177 (diff) | |
parent | edc22d3a25c5c963a5c03277d141599cd19a046f (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/lvm')
-rw-r--r-- | package/lvm/Makefile | 13 | ||||
-rw-r--r-- | package/lvm/patches/patch-make_tmpl_in | 13 |
2 files changed, 18 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-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) $@ |