From 3c0992625fa3a54ce1f26f4b2cec8581c60758b2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 6 Mar 2010 13:15:00 +0100 Subject: update to latest upstream version, make a new subpackage for libdevmapper --- package/lvm/Makefile | 20 ++++++++------ package/lvm/patches/patch-Makefile_in | 12 ++++---- package/lvm/patches/patch-doc_Makefile_in | 13 --------- package/lvm/patches/patch-libdm_Makefile_in | 43 ++++++++--------------------- package/lvm/patches/patch-tools_Makefile_in | 37 +++++++++++-------------- 5 files changed, 46 insertions(+), 79 deletions(-) delete mode 100644 package/lvm/patches/patch-doc_Makefile_in diff --git a/package/lvm/Makefile b/package/lvm/Makefile index d67bbc43e..5013b1645 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,16 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.51 +PKG_VERSION:= 2.02.61 PKG_RELEASE:= 1 -PKG_MD5SUM:= 725d07794007e021bfc592b1636100c7 +PKG_MD5SUM:= 0fdac768c78d96525d47b5a3df4c67de PKG_DESCR:= logical volume management PKG_SECTION:= misc -PKG_DEPENDS:= device-mapper libncurses +PKG_DEPENDS:= libdevmapper libncurses PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ -PKG_DESCR_DM:= device-mapper library and utility +PKG_DESCR_DM:= device-mapper utility +PKG_DESCR_LIBDM:= device-mapper library DISTFILES:= LVM2.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} @@ -21,6 +22,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},,${PKG_DESCR_DM},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION})) CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ @@ -30,12 +32,14 @@ post-install: # lvm ${INSTALL_DIR} ${IDIR_LVM}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm - # device-mapper - ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib + # libdevmapper + ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ - ${IDIR_DEVICE_MAPPER}/usr/lib + ${IDIR_LIBDEVMAPPER}/usr/lib + chmod u+w ${IDIR_LIBDEVMAPPER}/usr/lib/*.so* + # device-mapper + ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ ${IDIR_DEVICE_MAPPER}/usr/sbin - chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so* include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in index d0e22571f..fd15b0060 100644 --- a/package/lvm/patches/patch-Makefile_in +++ b/package/lvm/patches/patch-Makefile_in @@ -1,15 +1,15 @@ ---- LVM2.2.02.51.orig/Makefile.in 2009-07-31 13:49:53.000000000 +0200 -+++ LVM2.2.02.51/Makefile.in 2009-08-22 15:24:06.000000000 +0200 -@@ -16,7 +16,7 @@ srcdir = @srcdir@ - top_srcdir = @top_srcdir@ +--- LVM2.2.02.61.orig/Makefile.in 2009-10-02 21:10:31.000000000 +0200 ++++ LVM2.2.02.61/Makefile.in 2010-03-03 19:43:58.976123551 +0100 +@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ VPATH = @srcdir@ -SUBDIRS = doc include man scripts -+SUBDIRS = doc include ++SUBDIRS = include ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev -@@ -60,7 +60,7 @@ po: tools daemons +@@ -64,7 +64,7 @@ po: tools daemons libdm.device-mapper: include.device-mapper daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in deleted file mode 100644 index 381e0ceea..000000000 --- a/package/lvm/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ -bsd compatibility ---- LVM2.2.02.51.orig/doc/Makefile.in 2009-05-11 12:28:46.000000000 +0200 -+++ LVM2.2.02.51/doc/Makefile.in 2009-08-22 15:24:06.000000000 +0200 -@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl - install_lvm2: - @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ - echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \ -- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \ -+ @INSTALL@ -d $(confdir); \ -+ @INSTALL@ $(OWNER) $(GROUP) -m 644 $(CONFSRC) \ - $(confdir)/$(CONFDEST); \ - fi - diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 0a7799b33..259f0f9d3 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,41 +1,21 @@ -always install static library ---- LVM2.2.02.51.orig/libdm/Makefile.in Wed Apr 8 16:04:35 2009 -+++ LVM2.2.02.51/libdm/Makefile.in Mon Feb 15 23:25:01 2010 -@@ -34,9 +34,9 @@ SOURCES =\ - - INCLUDES = -I$(interface) -I. - --ifeq ("@STATIC_LINK@", "yes") -+#ifeq ("@STATIC_LINK@", "yes") - LIB_STATIC = $(interface)/libdevmapper.a --endif -+#endif - - ifeq ("@LIB_SUFFIX@","dylib") - LIB_SHARED = $(interface)/libdevmapper.dylib -@@ -59,9 +59,9 @@ device-mapper: all - - INSTALL_TYPE = install_dynamic - --ifeq ("@STATIC_LINK@", "yes") -+#ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static --endif -+#endif - - ifeq ("@PKGCONFIG@", "yes") - INSTALL_TYPE += install_pkgconfig -@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include +--- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200 ++++ LVM2.2.02.61/libdm/Makefile.in 2010-03-03 19:48:02.316248648 +0100 +@@ -73,26 +73,32 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install install_include: -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ + $(INSTALL) -d $(includedir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \ ++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ $(includedir)/libdevmapper.h install_dynamic: install_@interface@ -@@ -83,15 +84,17 @@ install_static: install_@interface@_static ++ $(INSTALL) -d $(libdir) + $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \ + $(libdir)/libdevmapper.$(LIB_SUFFIX) + + install_static: install_@interface@_static ++ $(INSTALL) -d $(libdir) $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) @@ -52,6 +32,7 @@ always install static library install_ioctl_static: ioctl/libdevmapper.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ ++ $(INSTALL) -d $(libdir) + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.a.$(LIB_VERSION_DM) diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index 8d6e49a3f..ae6fcbf8f 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,33 +1,28 @@ ---- LVM2.2.02.51.orig/tools/Makefile.in Thu May 21 13:11:29 2009 -+++ LVM2.2.02.51/tools/Makefile.in Mon Feb 15 23:30:04 2010 -@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) - - .commands: commands.h cmdnames.h Makefile - $(CC) -E -P cmdnames.h 2> /dev/null | \ -- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands -+ egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands - - .PHONY: install_cmdlib_dynamic install_cmdlib_static \ - install_tools_dynamic install_tools_static -@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref +--- LVM2.2.02.61.orig/tools/Makefile.in 2010-01-19 02:10:47.000000000 +0100 ++++ LVM2.2.02.61/tools/Makefile.in 2010-03-03 19:46:06.396138753 +0100 +@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r endif install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \ ++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ ++ $(INSTALL) -d $(includedir) ++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ $(includedir)/lvm2cmd.h install_cmdlib_static: liblvm2cmd-static.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ ++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2cmd.a.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ ++ $(INSTALL) -d $(includedir) ++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ $(includedir)/lvm2cmd.h install_tools_dynamic: lvm .commands @@ -37,13 +32,13 @@ $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @( \ -@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands +@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands ) install_tools_static: lvm.static -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -d $(sbindir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ ++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(staticdir)/lvm.static install_dmsetup_dynamic: dmsetup -- cgit v1.2.3