summaryrefslogtreecommitdiff
path: root/package/lvm/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-22 16:19:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-22 16:19:02 +0200
commit0bc52de49b72c721c823042c1920b90887c8e0b1 (patch)
tree6320cc008d20be751f19523c1fe6326d574a471f /package/lvm/patches
parentacd5d0f4a9b1ed64975968126680f5247691ddba (diff)
update to latest upstream
- force building of static libdevmapper library via patch
Diffstat (limited to 'package/lvm/patches')
-rw-r--r--package/lvm/patches/patch-Makefile_in10
-rw-r--r--package/lvm/patches/patch-doc_Makefile_in7
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in33
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in52
4 files changed, 61 insertions, 41 deletions
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index e22bc814b..d0e22571f 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
---- LVM2.2.02.45.orig/Makefile.in 2008-11-18 14:16:03.000000000 +0100
-+++ LVM2.2.02.45/Makefile.in 2009-06-11 23:21:31.000000000 +0200
+--- 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@
VPATH = @srcdir@
@@ -7,9 +7,9 @@
-SUBDIRS = doc include man scripts
+SUBDIRS = doc include
- ifeq ("@INTL@", "yes")
- SUBDIRS += po
-@@ -49,7 +49,7 @@ po: tools daemons
+ ifeq ("@UDEV_RULES@", "yes")
+ SUBDIRS += udev
+@@ -60,7 +60,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
index 758eb54e4..381e0ceea 100644
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ b/package/lvm/patches/patch-doc_Makefile_in
@@ -1,7 +1,8 @@
---- LVM2.2.02.45.orig/doc/Makefile.in 2007-09-21 12:16:43.000000000 +0200
-+++ LVM2.2.02.45/doc/Makefile.in 2009-06-11 23:17:13.000000000 +0200
+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:
+ install_lvm2:
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index c6d63a3fe..02d029e48 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,6 +1,31 @@
---- LVM2.2.02.45.orig/libdm/Makefile.in 2008-11-14 21:59:56.000000000 +0100
-+++ LVM2.2.02.45/libdm/Makefile.in 2009-06-11 23:26:48.000000000 +0200
-@@ -70,7 +70,8 @@ install: $(INSTALL_TYPE) install_include
+always install static library
+--- LVM2.2.02.51.orig/libdm/Makefile.in 2009-04-08 16:04:35.000000000 +0200
++++ LVM2.2.02.51/libdm/Makefile.in 2009-08-22 15:37:53.000000000 +0200
+@@ -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
install_device-mapper: install
install_include:
@@ -10,7 +35,7 @@
$(includedir)/libdevmapper.h
install_dynamic: install_@interface@
-@@ -81,15 +82,17 @@ install_static: install_@interface@_stat
+@@ -83,15 +84,17 @@ install_static: install_@interface@_stat
$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index ed2a2c974..5dc0235e4 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,33 +1,24 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- LVM2.2.02.45.orig/tools/Makefile.in 2009-02-17 12:07:59.000000000 +0100
-+++ LVM2.2.02.45/tools/Makefile.in 2009-06-11 23:24:12.000000000 +0200
-@@ -62,19 +62,18 @@ SOURCES =\
- vgscan.c \
- vgsplit.c
-
--TARGETS =\
-- .commands \
-- lvm
--
--INSTALL_LVM_TARGETS = install_tools_dynamic
--INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
--INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
-+TARGETS = .commands
-
- ifeq ("@STATIC_LINK@", "yes")
- TARGETS += lvm.static
- INSTALL_LVM_TARGETS += install_tools_static
- INSTALL_DMSETUP_TARGETS += install_dmsetup_static
- INSTALL_CMDLIB_TARGETS += install_cmdlib_static
-+else
-+ TARGETS += lvm
-+ INSTALL_LVM_TARGETS = install_tools_dynamic
-+ INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
-+ INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
+--- LVM2.2.02.51.orig/tools/Makefile.in 2009-05-21 13:11:29.000000000 +0200
++++ LVM2.2.02.51/tools/Makefile.in 2009-08-22 15:30:31.000000000 +0200
+@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
endif
- LVMLIBS = -llvm
-@@ -170,7 +169,8 @@ install_cmdlib_static: liblvm2cmd-static
+ install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++ $(INSTALL) -d $(libdir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+ $(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 \
+ $(includedir)/lvm2cmd.h
+
+ install_cmdlib_static: liblvm2cmd-static.a
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++ $(INSTALL) -d $(libdir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+ $(libdir)/liblvm2cmd.a.$(LIB_VERSION)
+ $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_tools_dynamic: lvm .commands
@@ -37,20 +28,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -181,14 +181,14 @@ install_tools_dynamic: lvm .commands
+@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
)
install_tools_static: lvm.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++ $(INSTALL) -d $(sbindir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
$(staticdir)/lvm.static
install_dmsetup_dynamic: dmsetup
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++ $(INSTALL) -d $(sbindir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
install_dmsetup_static: dmsetup.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++ $(INSTALL) -d $(sbindir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)