summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-16 16:27:36 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-16 17:36:01 -0500
commit9071fbf942af58c055f7eea5cddd16614f9c1739 (patch)
tree59939ba626c832f49e08530ae7f51860132e51e1 /package
parent2282c32b4d4b542ea3fecc4e7b68a435ecf07aed (diff)
update lvm to latest
Diffstat (limited to 'package')
-rw-r--r--package/lvm/Makefile8
-rw-r--r--package/lvm/patches/patch-make_tmpl_in11
2 files changed, 5 insertions, 14 deletions
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index ec3bc8439..ab6b30faa 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.116
+PKG_VERSION:= 2.02.120
PKG_RELEASE:= 1
-PKG_HASH:= 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767
+PKG_HASH:= 8d6bd02f7d00315482538ece3e831cd81709c29d74ce71229c60192fb166081a
PKG_DESCR:= logical volume management
PKG_SECTION:= sys/fs
PKG_DEPENDS:= libdevmapper libncurses
@@ -38,6 +38,7 @@ endif
CONFIGURE_ARGS+= --with-user="" --with-group="" \
--with-optimisation="" \
--disable-testing \
+ --disable-blkid_wiping \
--with-lvm1=none
CONFIGURE_ENV+= ac_cv_flag_HAVE_PIE=no \
ac_cv_func_malloc_0_nonnull=yes \
@@ -45,7 +46,8 @@ CONFIGURE_ENV+= ac_cv_flag_HAVE_PIE=no \
lvm-install:
${INSTALL_DIR} ${IDIR_LVM}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm \
+ ${IDIR_LVM}/usr/sbin
libdevmapper-install:
${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib
diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in
deleted file mode 100644
index e25835467..000000000
--- a/package/lvm/patches/patch-make_tmpl_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- LVM2.2.02.106.orig/make.tmpl.in 2014-04-10 17:38:46.000000000 +0200
-+++ LVM2.2.02.106/make.tmpl.in 2014-05-23 08:48:28.000000000 +0200
-@@ -46,7 +46,7 @@ LIBS = @LIBS@
- STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
--CFLAGS += @CFLAGS@
-+CFLAGS ?= @CFLAGS@
- CLDFLAGS += @CLDFLAGS@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@