From f4b29ffa95b42c19a1adf84991082cc1740c30fd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 10:07:17 +0200 Subject: update to latest upstream --- package/lvm/Makefile | 7 ++-- package/lvm/patches/patch-Makefile_in | 20 --------- package/lvm/patches/patch-doc_Makefile_in | 14 ------- package/lvm/patches/patch-libdm_Makefile_in | 50 ----------------------- package/lvm/patches/patch-make_tmpl_in | 40 ++++-------------- package/lvm/patches/patch-scripts_Makefile_in | 12 ------ package/lvm/patches/patch-tools_Makefile_in | 58 --------------------------- 7 files changed, 11 insertions(+), 190 deletions(-) delete mode 100644 package/lvm/patches/patch-Makefile_in delete mode 100644 package/lvm/patches/patch-doc_Makefile_in delete mode 100644 package/lvm/patches/patch-libdm_Makefile_in delete mode 100644 package/lvm/patches/patch-scripts_Makefile_in delete mode 100644 package/lvm/patches/patch-tools_Makefile_in diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 60927ab60..401855955 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.80 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2 +PKG_VERSION:= 2.02.106 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 77f84279fb649b3dc4edad1c6d1a1b0e PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses @@ -36,6 +36,7 @@ $(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEAS CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ + --disable-testing \ --with-lvm1=none lvm-install: diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in deleted file mode 100644 index 22b0626e5..000000000 --- a/package/lvm/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in deleted file mode 100644 index 0f5ca59fc..000000000 --- a/package/lvm/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,14 +0,0 @@ ---- LVM2.2.02.72.orig/doc/Makefile.in Thu May 20 13:45:57 2010 -+++ LVM2.2.02.72/doc/Makefile.in Fri Jul 30 09:23:26 2010 -@@ -22,8 +22,9 @@ include $(top_builddir)/make.tmpl - - install_lvm2: $(CONFSRC) - @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ -- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \ -- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \ -+ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \ -+ $(INSTALL_DIR) $(confdir); \ -+ $(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \ - fi - - install: install_lvm2 diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in deleted file mode 100644 index 49f49a17a..000000000 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ /dev/null @@ -1,50 +0,0 @@ ---- LVM2.2.02.79.orig/libdm/Makefile.in 2010-08-03 15:00:46.000000000 +0200 -+++ LVM2.2.02.79/libdm/Makefile.in 2010-12-26 22:15:11.000000000 +0100 -@@ -34,10 +34,7 @@ SOURCES =\ - - INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) - --ifeq ("@STATIC_LINK@", "yes") - LIB_STATIC = $(interface)/libdevmapper.a --endif -- - LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) - LIB_VERSION = $(LIB_VERSION_DM) - TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) -@@ -65,10 +62,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. - install_pkgconfig - - INSTALL_TYPE = install_dynamic -- --ifeq ("@STATIC_LINK@", "yes") -- INSTALL_TYPE += install_static --endif -+INSTALL_TYPE += install_static - - ifeq ("@PKGCONFIG@", "yes") - INSTALL_TYPE += install_pkgconfig -@@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include - install_device-mapper: install - - install_include: $(srcdir)/libdevmapper.h -- $(INSTALL_DATA) -D $< $(includedir)/$( /dev/null | \ -- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands -+ egrep -v '^ *(#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands - - ifneq ("$(CFLOW_CMD)", "") - CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) -@@ -171,18 +171,22 @@ endif - install_dmsetup_dynamic install_dmsetup_static - - install_cmdlib_include: $(srcdir)/lvm2cmd.h -- $(INSTALL_DATA) -D $< $(includedir)/$(