karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

lvm2: Updated (2.02.39 -> 2.02.54) added ALT Linux patches and mangled them.

karasz/new-early
Nagy Karoly Gabriel 15 years ago
parent
1afc099f0a
commit
bb05dfb72a
13 changed files with 518 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      base/lvm2/device-mapper-1.02.31-alt-pkgconfig.patch
  2. 54
      base/lvm2/device-mapper.1.02.02-alt-verbose.patch
  3. 30
      base/lvm2/device-mapper.1.02.31-alt-LIB_VERSION.patch
  4. 4
      base/lvm2/dietlibc.patch.disable
  5. 55
      base/lvm2/lvm2-2.02.51-alt-fix-unresolved-symbols-in-liblvm2app.patch
  6. 57
      base/lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-libdevmapper-event-plugins.patch
  7. 43
      base/lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-libdevmapper-event.patch
  8. 69
      base/lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-liblvm2cmd.patch
  9. 116
      base/lvm2/lvm2-fedora-cluster-locking-built-in.patch
  10. 10
      base/lvm2/lvm2.conf
  11. 6
      base/lvm2/lvm2.desc
  12. 73
      base/lvm2/no_dynamic.diff
  13. 36
      base/lvm2/no_libdm_strip.patch

39
base/lvm2/device-mapper-1.02.31-alt-pkgconfig.patch
Unescape View File

@ -0,0 +1,39 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/device-mapper-1.02.31-alt-pkgconfig.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff --git a/LVM2/configure.in b/LVM2/configure.in
index 1eaa2a0..4fe8328 100644
--- ./configure.in.orig
+++ ./configure.in
@@ -803,6 +807,7 @@ AC_SUBST(SNAPSHOTS)
AC_SUBST(STATICDIR)
AC_SUBST(STATIC_LINK)
AC_SUBST([LIB_PTHREAD])
+AC_SUBST(SELINUX_LIBS)
AC_SUBST(interface)
AC_SUBST(kerneldir)
AC_SUBST(missingkernel)
diff --git a/LVM2/libdm/libdevmapper.pc.in b/LVM2/libdm/libdevmapper.pc.in
index 5d2aa17..15486cb 100644
--- ./libdm/libdevmapper.pc.in
+++ ./libdm/libdevmapper.pc.in
@@ -8,4 +8,4 @@ Description: device-mapper library
Version: @DM_LIB_PATCHLEVEL@
Cflags: -I${includedir}
Libs: -L${libdir} -ldevmapper
-Libs.private: @SELINUX_LIBS@
+Libs.private: @SELINUX_LIBS@ @LIB_PTHREAD@

54
base/lvm2/device-mapper.1.02.02-alt-verbose.patch
Unescape View File

@ -0,0 +1,54 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/device-mapper.1.02.02-alt-verbose.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./libdm/ioctl/libdm-iface.c.orig 2005-12-02 02:11:41 +0300
+++ ./libdm/ioctl/libdm-iface.c 2006-02-07 02:08:35 +0300
@@ -156,7 +156,7 @@ static int _get_proc_number(const char *
fclose(fl);
if (number) {
- log_error("%s: No entry for %s found", file, name);
+ log_verbose("%s: No entry for %s found", file, name);
return 0;
}
@@ -279,7 +279,7 @@ static int _open_control(void)
{
#ifdef DM_IOCTLS
char control[PATH_MAX];
- uint32_t major = 0, minor;
+ uint32_t major = 0, minor = 0;
if (_control_fd != -1)
return 1;
@@ -287,7 +287,7 @@ static int _open_control(void)
snprintf(control, sizeof(control), "%s/control", dm_dir());
if (!_control_device_number(&major, &minor))
- log_error("Is device-mapper driver missing from kernel?");
+ log_verbose("Is device-mapper driver missing from kernel?");
if (!_control_exists(control, major, minor) &&
!_create_control(control, major, minor))
@@ -306,7 +306,7 @@ static int _open_control(void)
return 1;
error:
- log_error("Failure to communicate with kernel device-mapper driver.");
+ log_verbose("Failure to communicate with kernel device-mapper driver.");
return 0;
#else
return 1;

30
base/lvm2/device-mapper.1.02.31-alt-LIB_VERSION.patch
Unescape View File

@ -0,0 +1,30 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/device-mapper.1.02.31-alt-LIB_VERSION.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff --git a/LVM2/make.tmpl.in b/LVM2/make.tmpl.in
index 1619aeb..38baf15 100644
--- ./make.tmpl.in.orig
+++ ./make.tmpl.in
@@ -113,8 +113,7 @@ LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
LIB_VERSION_LVM := $(shell cat $(top_srcdir)/VERSION | \
awk -F '.' '{printf "%s.%s",$$1,$$2}')
-LIB_VERSION_DM := $(shell cat $(top_srcdir)/VERSION_DM | \
- awk -F '.' '{printf "%s.%s",$$1,$$2}')
+LIB_VERSION_DM := 1.00
INCLUDES += -I. -I$(top_srcdir)/include

4
base/lvm2/dietlibc.patch → base/lvm2/dietlibc.patch.disable
Unescape View File

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../lvm2/dietlibc.patch # Filename: package/.../lvm2/dietlibc.patch.disable
# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2007 - 2009 The OpenSDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
# #

55
base/lvm2/lvm2-2.02.51-alt-fix-unresolved-symbols-in-liblvm2app.patch
Unescape View File

@ -0,0 +1,55 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/lvm2-2.02.51-alt-fix-unresolved-symbols-in-liblvm2app.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From 48ffb385c57349ce73e63139695f9ada74ce92a4 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@altlinux.org>
Date: Fri, 28 Aug 2009 17:54:30 +0400
Subject: [PATCH 1/2] Fix unresolved symbols in liblvm2app.so.
---
LVM2/liblvm/Makefile.in | 2 +-
LVM2/make.tmpl.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LVM2/liblvm/Makefile.in b/LVM2/liblvm/Makefile.in
index 305cef5..a5c1108 100644
--- ./liblvm/Makefile.in.orig
+++ ./liblvm/Makefile.in
@@ -40,7 +40,7 @@ CLEAN_TARGETS += liblvm.cflow
include $(top_srcdir)/make.tmpl
-LIBS += -ldevmapper -llvm-internal
+LIBS += -ldevmapper -llvm-internal -ldl
$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_APP): %.$(LIB_SUFFIX)
rm -f $@
diff --git a/LVM2/make.tmpl.in b/LVM2/make.tmpl.in
index 5db9ab5..eb9ccf2 100644
--- ./make.tmpl.in.orig
+++ ./make.tmpl.in
@@ -208,7 +208,7 @@ $(TARGETS): $(OBJECTS)
ifeq ("@LIB_SUFFIX@","so")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ $(CFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@ $(LIBS)
endif
ifeq ("@LIB_SUFFIX@","dylib")
--
1.6.4.2

57
base/lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-libdevmapper-event-plugins.patch
Unescape View File

@ -0,0 +1,57 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-libdevmapper-event-plugins.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From 1a17c55c0b49e4679e121c394374625263b0343c Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@altlinux.org>
Date: Thu, 24 Sep 2009 13:35:57 +0400
Subject: [PATCH] Fix libdevmapper-event plugins linking.
Those plugins use symbols from libdevmapper and lvm2cmd so they should
be linked to those libraries.
---
LVM2/daemons/dmeventd/plugins/mirror/Makefile.in | 2 ++
LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/LVM2/daemons/dmeventd/plugins/mirror/Makefile.in b/LVM2/daemons/dmeventd/plugins/mirror/Makefile.in
index 51eaba6..5f36d8a 100644
--- ./daemons/dmeventd/plugins/mirror/Makefile.in.orig
+++ ./daemons/dmeventd/plugins/mirror/Makefile.in
@@ -31,6 +31,8 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_srcdir)/make.tmpl
+LIBS = -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
+
install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/$<.$(LIB_VERSION)
diff --git a/LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in b/LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in
index 863838f..29239e7 100644
--- ./daemons/dmeventd/plugins/snapshot/Makefile.in.orig
+++ ./daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -31,6 +31,8 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_srcdir)/make.tmpl
+LIBS = -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
+
install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/$<.$(LIB_VERSION)
--
1.6.4.4

43
base/lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-libdevmapper-event.patch
Unescape View File

@ -0,0 +1,43 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-libdevmapper-event.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From 93f516ba924a14a5722086071b44e82f87ec18a0 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@altlinux.org>
Date: Thu, 24 Sep 2009 13:23:29 +0400
Subject: [PATCH] Fix libdevmapper-event linking.
This library uses symbols from libdevmapper so it should be linked to
it.
---
LVM2/daemons/dmeventd/Makefile.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/LVM2/daemons/dmeventd/Makefile.in b/LVM2/daemons/dmeventd/Makefile.in
index 1e659e0..51f880d 100644
--- ./daemons/dmeventd/Makefile.in.orig
+++ ./daemons/dmeventd/Makefile.in
@@ -87,6 +87,8 @@ install_static: libdevmapper-event.a
$(libdir)/libdevmapper-event.a.$(LIB_VERSION)
$(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
+LIBS = -ldevmapper
+
$(VERSIONED_SHLIB): $(LIB_SHARED)
$(RM) -f $@
$(LN_S) $(LIB_SHARED) $@
--
1.6.4.4

69
base/lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-liblvm2cmd.patch
Unescape View File

@ -0,0 +1,69 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/lvm2-2.02.52-alt-fix-unresolved-symbols-in-liblvm2cmd.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./tools/Makefile.in.orig 2009-10-13 03:31:10.000000000 +0200
+++ ./tools/Makefile.in 2009-11-07 08:23:14.000000000 +0100
@@ -138,6 +138,7 @@
cat $(top_builddir)/lib/liblvm-internal.a > $@
$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
+liblvm2cmd.$(LIB_SUFFIX): LIBS += -ldevmapper -llvm-internal -ldl -ldevmapper-event
liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
.commands: commands.h cmdnames.h Makefile
@@ -165,21 +166,21 @@
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< \
$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_cmdlib_static: liblvm2cmd-static.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< \
$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_tools_dynamic: lvm .commands
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 lvm \
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
@@ -190,14 +191,14 @@
)
install_tools_static: lvm.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< \
$(staticdir)/lvm.static
install_dmsetup_dynamic: dmsetup
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< $(sbindir)/$<
install_dmsetup_static: dmsetup.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< $(sbindir)/$<
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)

116
base/lvm2/lvm2-fedora-cluster-locking-built-in.patch
Unescape View File

@ -0,0 +1,116 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/lvm2-fedora-cluster-locking-built-in.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./scripts/lvmconf.sh.orig 2006-09-20 18:36:47.000000000 +0100
+++ ./scripts/lvmconf.sh 2006-10-20 19:20:26.000000000 +0100
@@ -36,7 +36,7 @@ function parse_args
while [ -n "$1" ]; do
case $1 in
--enable-cluster)
- LOCKING_TYPE=2
+ LOCKING_TYPE=3
shift
;;
--disable-cluster)
@@ -94,15 +94,13 @@ function validate_args
if [ -n "$LOCKINGLIBDIR" ]; then
- [ -z "$LOCKINGLIB" ] && LOCKINGLIB="liblvm2clusterlock.so"
-
if [ "${LOCKINGLIBDIR:0:1}" != "/" ]
then
echo "Prefix must be an absolute path name (starting with a /)"
exit 12
fi
- if [ ! -f "$LOCKINGLIBDIR/$LOCKINGLIB" ]
+ if [ -n "$LOCKINGLIB" ] && [ ! -f "$LOCKINGLIBDIR/$LOCKINGLIB" ]
then
echo "$LOCKINGLIBDIR/$LOCKINGLIB does not exist, did you do a \"make install\" ?"
exit 11
@@ -170,13 +168,29 @@ then
if [ -z "$LOCKING_TYPE" ]; then
LOCKING_TYPE=1
fi
- if [ "$LOCKING_TYPE" = "2" ]; then
+ if [ "$LOCKING_TYPE" = "3" ] || [ "$LOCKING_TYPE" = "2" ]; then
cat $CONFIGFILE - <<EOF > $TMPFILE
global {
# Enable locking for cluster LVM
locking_type = $LOCKING_TYPE
library_dir = "$LOCKINGLIBDIR"
+EOF
+ if [ $? != 0 ]
+ then
+ echo "failed to create temporary config file, $CONFIGFILE not updated"
+ exit 14
+ fi
+ if [ -n "$LOCKINGLIB" ]; then
+ cat - <<EOF >> $TMPFILE
locking_library = "$LOCKINGLIB"
+EOF
+ if [ $? != 0 ]
+ then
+ echo "failed to create temporary config file, $CONFIGFILE not updated"
+ exit 16
+ fi
+ fi
+ cat - <<EOF >> $TMPFILE
}
EOF
fi # if we aren't setting cluster locking, we don't need to create a global section
@@ -184,7 +198,7 @@ EOF
if [ $? != 0 ]
then
echo "failed to create temporary config file, $CONFIGFILE not updated"
- exit 14
+ exit 17
fi
else
#
@@ -208,8 +222,10 @@ else
else
SEDCMD="${SEDCMD}\n/global[[:blank:]]*{/a\ \ \ \ library_dir = \"$LOCKINGLIBDIR\""
fi
+ fi
- if [ "$have_library" = "0" ]
+ if [ -n "$LOCKINGLIB" ]; then
+ if [ "$have_library" = "0" ]
then
SEDCMD="${SEDCMD}\ns/^[[:blank:]]*locking_library[[:blank:]]*=.*/\ \ \ \ locking_library = \"$LOCKINGLIB\"/g"
else
@@ -217,19 +233,6 @@ else
fi
fi
- if [ "$LOCKING_TYPE" = "1" ]; then
- # if we're not using cluster locking, remove the library dir and locking library name
- if [ "$have_dir" = "0" ]
- then
- SEDCMD="${SEDCMD}\n/^[[:blank:]]*library_dir[[:blank:]]*=.*/d"
- fi
-
- if [ "$have_library" = "0" ]
- then
- SEDCMD="${SEDCMD}\n/^[[:blank:]]*locking_library[[:blank:]]*=.*/d"
- fi
- fi
-
echo -e $SEDCMD > $SCRIPTFILE
sed <$CONFIGFILE >$TMPFILE -f $SCRIPTFILE
if [ $? != 0 ]

10
base/lvm2/lvm2.conf
Unescape View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../lvm2/lvm2.conf # Filename: package/.../lvm2/lvm2.conf
# Copyright (C) 2007 - 2008 The OpenSDE Project # Copyright (C) 2007 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -19,6 +19,14 @@ set_confopt
if [ "$SDECFG_STATIC" == 1 ]; then if [ "$SDECFG_STATIC" == 1 ]; then
var_append patchfiles ' ' "$confdir/no_dynamic.diff" var_append patchfiles ' ' "$confdir/no_dynamic.diff"
var_append confopt ' ' '--enable-static_link=yes' var_append confopt ' ' '--enable-static_link=yes'
var_append confopt ' ' '--with-mirrors=internal'
var_append confopt ' ' '--with-snapshots=internal'
var_append confopt ' ' '--with-clvmd=none'
var_append confopt ' ' '--with-cluster=none'
var_append confopt ' ' 'ac_cv_lib_dl_dlopen=no'
var_append makeopt ' ' 'LIB_SHARED= VERSIONED_SHLIB='
fi fi
# if there is no device-mapper, lvm2 tools fallback to $0.lvm1 # if there is no device-mapper, lvm2 tools fallback to $0.lvm1

6
base/lvm2/lvm2.desc
Unescape View File

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../lvm2/lvm2.desc [COPY] Filename: package/.../lvm2/lvm2.desc
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY] [COPY]
@ -33,7 +33,7 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 2.02.39 [V] 2.02.54
[P] X -?-3-----9 184.000 [P] X -?-3-----9 184.000
[D] 2315534042 LVM2.2.02.39.tgz ftp://sources.redhat.com/pub/lvm2/ [D] 4138177348 LVM2.2.02.54.tgz ftp://sources.redhat.com/pub/lvm2/

73
base/lvm2/no_dynamic.diff
Unescape View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../lvm2/no_dynamic.diff # Filename: package/.../lvm2/no_dynamic.diff
# Copyright (C) 2007 - 2008 The OpenSDE Project # Copyright (C) 2007 - 2009 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -17,75 +17,12 @@
--- ./make.tmpl.in.orig 2006-07-07 19:57:41.000000000 +0000 --- ./make.tmpl.in.orig 2006-07-07 19:57:41.000000000 +0000
+++ ./make.tmpl.in 2006-07-07 19:58:24.000000000 +0000 +++ ./make.tmpl.in 2006-07-07 19:58:24.000000000 +0000
@@ -110,7 +110,7 @@ @@ -147,7 +147,7 @@
SUBDIRS.clean := $(SUBDIRS:=.clean) SUBDIRS.clean := $(SUBDIRS:=.clean)
SUBDIRS.distclean := $(SUBDIRS:=.distclean) SUBDIRS.distclean := $(SUBDIRS:=.distclean)
-TARGETS += $(LIB_SHARED) $(LIB_STATIC) -TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB)
+TARGETS += $(LIB_STATIC) +TARGETS += $(LIB_STATIC)
all: $(SUBDIRS) $(TARGETS) all: $(SUBDIRS) $(TARGETS)
--- ./tools/Makefile.in.orig 2008-09-04 15:57:21.000000000 -0400
+++ ./tools/Makefile.in 2008-09-04 16:04:57.000000000 -0400
@@ -67,11 +67,10 @@
vgsplit.c
TARGETS =\
- .commands \
- lvm
+ .commands
-INSTALL_TARGETS = install_tools_dynamic
-INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
+INSTALL_TARGETS =
+INSTALL_CMDLIB_TARGETS =
ifeq ("@STATIC_LINK@", "yes")
TARGETS += lvm.static
@@ -87,7 +86,7 @@
lvmcmdlib.o lvm-static.o
ifeq ("@CMDLIB@", "yes")
- TARGETS += liblvm2cmd.so
+ TARGETS += liblvm2cmd.a
INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS)
endif
@@ -103,7 +103,7 @@
LIB_PTHREAD = @LIB_PTHREAD@
lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
- $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+ $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD)
liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
cat $(top_srcdir)/lib/liblvm.a > $@
@@ -166,6 +166,6 @@
install_tools_static: lvm.static
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
- $(staticdir)/lvm.static
+ $(staticdir)/lvm
install: $(INSTALL_TARGETS)
--- ./configure.orig 2008-06-27 15:57:27.000000000 -0400
+++ ./configure 2008-09-04 16:10:34.000000000 -0400
@@ -1958,7 +1958,6 @@
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
LDDEPS="$LDDEPS .export.sym"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
--- ./configure.in.orig 2008-09-04 16:07:39.000000000 -0400
+++ ./configure.in 2008-09-04 16:10:10.000000000 -0400
@@ -33,7 +33,6 @@
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
LDDEPS="$LDDEPS .export.sym"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes

36
base/lvm2/no_libdm_strip.patch
Unescape View File

@ -0,0 +1,36 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/no_libdm_strip.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./libdm/Makefile.in.orig 2009-10-02 21:10:36.000000000 +0200
+++ ./libdm/Makefile.in 2009-11-07 08:28:42.000000000 +0100
@@ -84,7 +84,7 @@
$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< \
$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
install_pkgconfig:
@@ -92,7 +92,7 @@
$(usrlibdir)/pkgconfig/devmapper.pc
install_ioctl_static: ioctl/libdevmapper.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $< \
$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
Write Preview
Loading…
Cancel
Save