diff options
Diffstat (limited to 'package/lvm/patches')
-rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 17 | ||||
-rw-r--r-- | package/lvm/patches/patch-make_tmpl_in | 8 | ||||
-rw-r--r-- | package/lvm/patches/patch-scripts_Makefile_in | 10 | ||||
-rw-r--r-- | package/lvm/patches/patch-tools_Makefile_in | 10 |
4 files changed, 22 insertions, 23 deletions
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 9a999133b..49f49a17a 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,5 +1,5 @@ ---- LVM2.2.02.72.orig/libdm/Makefile.in Fri Jun 25 20:17:39 2010 -+++ LVM2.2.02.72/libdm/Makefile.in Fri Jul 30 10:34:15 2010 +--- 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) @@ -11,19 +11,18 @@ LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) LIB_VERSION = $(LIB_VERSION_DM) TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) -@@ -65,11 +62,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX). +@@ -65,10 +62,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. install_pkgconfig INSTALL_TYPE = install_dynamic -+INSTALL_TYPE += install_static - +- -ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static -endif -- ++INSTALL_TYPE += install_static + ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig - endif @@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install @@ -34,7 +33,7 @@ install_dynamic: install_@interface@ -@@ -88,10 +83,12 @@ install_static: install_@interface@_static +@@ -88,10 +83,12 @@ install_static: install_@interface@_stat install_ioctl: install_lib_shared install_pkgconfig: libdevmapper.pc @@ -48,4 +47,4 @@ + $(INSTALL_DATA) $< $(usrlibdir)/$(<F) CLEAN_TARGETS += ioctl/libdevmapper.a - DISTCLEAN_TARGETS += libdevmapper.pc + DISTCLEAN_TARGETS += libdevmapper.pc .exported_symbols_generated diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in index 7ffbb36b5..43bd07008 100644 --- a/package/lvm/patches/patch-make_tmpl_in +++ b/package/lvm/patches/patch-make_tmpl_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.72.orig/make.tmpl.in Tue Jul 20 16:38:44 2010 -+++ LVM2.2.02.72/make.tmpl.in Fri Jul 30 10:22:54 2010 -@@ -312,7 +312,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) +--- 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 +@@ -322,7 +322,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI $(LN_S) -f $(<F) $@ install_lib_shared: $(LIB_SHARED) @@ -10,7 +10,7 @@ $(INSTALL_DIR) $(usrlibdir) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) -@@ -320,11 +321,13 @@ install_lib_shared: $(LIB_SHARED) +@@ -330,11 +331,13 @@ install_lib_shared: $(LIB_SHARED) # and for compatibility links in libdir are created # when the code is fixed links could be removed. install_dm_plugin: $(LIB_SHARED) diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in index 1886a1930..ae8e644cc 100644 --- a/package/lvm/patches/patch-scripts_Makefile_in +++ b/package/lvm/patches/patch-scripts_Makefile_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.72.orig/scripts/Makefile.in Thu May 20 16:45:17 2010 -+++ LVM2.2.02.72/scripts/Makefile.in Fri Jul 30 09:26:25 2010 -@@ -25,7 +25,8 @@ endif +--- LVM2.2.02.79.orig/scripts/Makefile.in 2010-11-05 17:18:38.000000000 +0100 ++++ LVM2.2.02.79/scripts/Makefile.in 2010-12-26 22:15:11.000000000 +0100 +@@ -30,7 +30,8 @@ endif vpath %.sh $(srcdir) %_install: %.sh @@ -8,5 +8,5 @@ + $(INSTALL_DIR) $(sbindir) + $(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F)) - install_lvm2: $(SCRIPTS:.sh=_install) - + %_install: %.ocf + $(INSTALL_DIR) $(ocf_scriptdir) diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index 81b1efc97..c7d18c051 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.72.orig/tools/Makefile.in Fri Jun 25 20:23:10 2010 -+++ LVM2.2.02.72/tools/Makefile.in Fri Jul 30 10:13:24 2010 -@@ -157,7 +157,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$( +--- LVM2.2.02.79.orig/tools/Makefile.in 2010-10-15 11:41:21.000000000 +0200 ++++ LVM2.2.02.79/tools/Makefile.in 2010-12-26 22:15:11.000000000 +0100 +@@ -158,7 +158,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \ @@ -9,7 +9,7 @@ ifneq ("$(CFLOW_CMD)", "") CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) -@@ -170,18 +170,22 @@ endif +@@ -171,18 +171,22 @@ endif install_dmsetup_dynamic install_dmsetup_static install_cmdlib_include: $(srcdir)/lvm2cmd.h @@ -36,7 +36,7 @@ @echo Creating symbolic links for individual commands in $(sbindir) @for v in `cat .commands`; do \ echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ -@@ -189,13 +193,16 @@ install_tools_dynamic: lvm .commands +@@ -190,13 +194,16 @@ install_tools_dynamic: lvm .commands done; install_tools_static: lvm.static |