r595 - lvm2/trunk/debian/patches
Bastian Blank
waldi at alioth.debian.org
Tue Jul 15 17:47:19 UTC 2008
Author: waldi
Date: Tue Jul 15 17:47:19 2008
New Revision: 595
Log:
debian/patches: Update for new upstream version.
Modified:
lvm2/trunk/debian/patches/config.patch
lvm2/trunk/debian/patches/drop-realtime.patch
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch (original)
+++ lvm2/trunk/debian/patches/config.patch Tue Jul 15 17:47:19 2008
@@ -1,6 +1,6 @@
---- trunk.orig/doc/example.conf
-+++ trunk/doc/example.conf
-@@ -258,7 +258,7 @@
+--- a/doc/example.conf
++++ b/doc/example.conf
+@@ -259,7 +259,7 @@
# Full pathnames can be given.
# Search this directory first for shared libraries.
Modified: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- lvm2/trunk/debian/patches/drop-realtime.patch (original)
+++ lvm2/trunk/debian/patches/drop-realtime.patch Tue Jul 15 17:47:19 2008
@@ -1,6 +1,6 @@
---- trunk.orig/lib/Makefile.in
-+++ trunk/lib/Makefile.in
-@@ -79,7 +79,6 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -80,7 +80,6 @@
misc/lvm-file.c \
misc/lvm-string.c \
misc/lvm-wrappers.c \
@@ -8,7 +8,7 @@
misc/util.c \
mm/memlock.c \
report/report.c \
---- trunk.orig/lib/misc/timestamp.c
+--- a/lib/misc/timestamp.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
@@ -141,7 +141,7 @@
- if (t)
- dm_free(t);
-}
---- trunk.orig/lib/misc/timestamp.h
+--- a/lib/misc/timestamp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
@@ -177,26 +177,26 @@
-
-#endif /* _LVM_TIMESTAMP_H */
-
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -42,7 +42,6 @@
- LIB_SUFFIX="so"
+--- a/configure.in
++++ b/configure.in
+@@ -38,7 +38,6 @@
DEVMAPPER=yes
ODIRECT=yes
+ DM_IOCTLS=yes
- REALTIME=yes
CLUSTER=internal
- FSADM=no ;;
- darwin*)
-@@ -56,7 +55,6 @@
- LIB_SUFFIX="dylib"
+ FSADM=no
+ ;;
+@@ -52,7 +51,6 @@
DEVMAPPER=yes
ODIRECT=no
+ DM_IOCTLS=no
- REALTIME=no
CLUSTER=none
- FSADM=no ;;
- esac
-@@ -277,13 +275,6 @@
- fi
+ FSADM=no
+ ;;
+@@ -275,13 +273,6 @@
+ AC_MSG_RESULT($READLINE)
################################################################################
-dnl -- Disable realtime clock support
@@ -209,8 +209,8 @@
dnl -- Build cluster LVM daemon
AC_MSG_CHECKING(whether to build cluster LVM daemon)
AC_ARG_WITH(clvmd,
-@@ -411,19 +402,6 @@
- fi
+@@ -429,19 +420,6 @@
+ AC_MSG_RESULT($STATIC_LINK)
################################################################################
-dnl -- Check for realtime clock support
@@ -227,13 +227,13 @@
-
-################################################################################
dnl -- Check for getopt
- AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 to if getopt_long is available.]))
+ AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
-@@ -552,7 +530,6 @@
- AC_SUBST(DEBUG)
- AC_SUBST(DEVMAPPER)
+@@ -574,7 +552,6 @@
+ AC_SUBST(FSADM)
+ AC_SUBST(GROUP)
AC_SUBST(HAVE_LIBDL)
-AC_SUBST(HAVE_REALTIME)
- AC_SUBST(CMDLIB)
- AC_SUBST(MSGFMT)
- AC_SUBST(LOCALEDIR)
+ AC_SUBST(INTL)
+ AC_SUBST(INTL_PACKAGE)
+ AC_SUBST(JOBS)
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch (original)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Tue Jul 15 17:47:19 2008
@@ -1,6 +1,6 @@
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -495,11 +495,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -517,11 +517,7 @@
AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
################################################################################
@@ -12,4 +12,4 @@
+AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["/sbin/modprobe"], [The path to 'modprobe', if available.])
################################################################################
- if test "-f VERSION"; then
+ LVM_VERSION="\"`cat VERSION 2>/dev/null || echo Unknown`\""
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch (original)
+++ lvm2/trunk/debian/patches/install.patch Tue Jul 15 17:47:19 2008
@@ -1,5 +1,5 @@
---- trunk.orig/tools/Makefile.in
-+++ trunk/tools/Makefile.in
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
@@ -141,22 +141,16 @@
endif
@@ -37,8 +37,8 @@
+ $(INSTALL) -D lvm.static $(staticdir)/lvm.static
install: $(INSTALL_TARGETS)
---- trunk.orig/daemons/clvmd/Makefile.in
-+++ trunk/daemons/clvmd/Makefile.in
+--- a/daemons/clvmd/Makefile.in
++++ b/daemons/clvmd/Makefile.in
@@ -89,8 +89,7 @@
.PHONY: install_clvmd
@@ -49,9 +49,9 @@
install: $(INSTALL_TARGETS)
---- trunk.orig/dmeventd/mirror/Makefile.in
-+++ trunk/dmeventd/mirror/Makefile.in
-@@ -30,7 +30,6 @@
+--- a/dmeventd/mirror/Makefile.in
++++ b/dmeventd/mirror/Makefile.in
+@@ -30,6 +30,5 @@
include $(top_srcdir)/make.tmpl
install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
@@ -59,9 +59,8 @@
- $(libdir)/$<.$(LIB_VERSION)
+ $(INSTALL) -D $< $(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
-
---- trunk.orig/lib/format1/Makefile.in
-+++ trunk/lib/format1/Makefile.in
+--- a/lib/format1/Makefile.in
++++ b/lib/format1/Makefile.in
@@ -30,7 +30,6 @@
include $(top_srcdir)/make.tmpl
@@ -71,8 +70,8 @@
+ $(INSTALL) -D $< $(libdir)/liblvm2format1.so.$(LIB_VERSION)
$(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so
---- trunk.orig/lib/format_pool/Makefile.in
-+++ trunk/lib/format_pool/Makefile.in
+--- a/lib/format_pool/Makefile.in
++++ b/lib/format_pool/Makefile.in
@@ -27,8 +27,7 @@
include $(top_srcdir)/make.tmpl
@@ -83,8 +82,8 @@
$(LN_S) -f liblvm2formatpool.so.$(LIB_VERSION) \
$(libdir)/liblvm2formatpool.so
---- trunk.orig/lib/locking/Makefile.in
-+++ trunk/lib/locking/Makefile.in
+--- a/lib/locking/Makefile.in
++++ b/lib/locking/Makefile.in
@@ -23,8 +23,7 @@
include $(top_srcdir)/make.tmpl
@@ -95,8 +94,8 @@
$(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \
$(libdir)/liblvm2clusterlock.so
---- trunk.orig/lib/mirror/Makefile.in
-+++ trunk/lib/mirror/Makefile.in
+--- a/lib/mirror/Makefile.in
++++ b/lib/mirror/Makefile.in
@@ -23,7 +23,6 @@
include $(top_srcdir)/make.tmpl
@@ -106,8 +105,8 @@
+ $(INSTALL) -D $< $(libdir)/liblvm2mirror.so.$(LIB_VERSION)
$(LN_S) -f liblvm2mirror.so.$(LIB_VERSION) $(libdir)/liblvm2mirror.so
---- trunk.orig/lib/snapshot/Makefile.in
-+++ trunk/lib/snapshot/Makefile.in
+--- a/lib/snapshot/Makefile.in
++++ b/lib/snapshot/Makefile.in
@@ -23,8 +23,7 @@
include $(top_srcdir)/make.tmpl
@@ -118,8 +117,8 @@
$(LN_S) -f liblvm2snapshot.so.$(LIB_VERSION) \
$(libdir)/liblvm2snapshot.so
---- trunk.orig/man/Makefile.in
-+++ trunk/man/Makefile.in
+--- a/man/Makefile.in
++++ b/man/Makefile.in
@@ -46,14 +46,14 @@
@for f in $(MAN8); \
do \
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch (original)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Tue Jul 15 17:47:19 2008
@@ -1,37 +1,23 @@
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -42,7 +42,6 @@
- LIB_SUFFIX="so"
+--- a/configure.in
++++ b/configure.in
+@@ -38,7 +38,6 @@
DEVMAPPER=yes
ODIRECT=yes
+ DM_IOCTLS=yes
- SELINUX=yes
REALTIME=yes
CLUSTER=internal
- FSADM=no ;;
-@@ -57,7 +56,6 @@
- LIB_SUFFIX="dylib"
+ FSADM=no
+@@ -53,7 +52,6 @@
DEVMAPPER=yes
ODIRECT=no
+ DM_IOCTLS=no
- SELINUX=no
REALTIME=no
CLUSTER=none
- FSADM=no ;;
-@@ -279,13 +277,6 @@
- fi
-
- ################################################################################
--dnl -- Disable selinux
--AC_MSG_CHECKING(whether to enable selinux support)
--AC_ARG_ENABLE(selinux, [ --disable-selinux Disable selinux support],
--SELINUX=$enableval)
--AC_MSG_RESULT($SELINUX)
--
--################################################################################
- dnl -- Disable realtime clock support
- AC_MSG_CHECKING(whether to enable realtime support)
- AC_ARG_ENABLE(realtime, [ --disable-realtime Disable realtime clock support],
-@@ -399,23 +390,6 @@
- AC_CHECK_FUNCS(mkdir rmdir uname,,AC_MSG_ERROR(bailing out))
+ FSADM=no
+@@ -401,23 +399,6 @@
+ fi;
################################################################################
-dnl -- Check for termcap (Shamelessly copied from parted 1.4.17)
@@ -54,15 +40,24 @@
dnl -- Check for dlopen
AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-@@ -437,37 +411,6 @@
- fi
+@@ -448,46 +429,6 @@
+ AC_MSG_RESULT($STATIC_LINK)
################################################################################
+-dnl -- Disable selinux
+-AC_MSG_CHECKING(whether to enable selinux support)
+-AC_ARG_ENABLE(selinux, [ --disable-selinux Disable selinux support],
+- SELINUX=$enableval)
+-AC_MSG_RESULT($SELINUX)
+-
+-################################################################################
-dnl -- Check for selinux
-if test x$SELINUX = xyes; then
- AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no)
-
- if test x$HAVE_SEPOL = xyes; then
+- AC_DEFINE([HAVE_SEPOL], 1,
+- [Define to 1 if sepol_check_context is available.])
- LIBS="-lsepol $LIBS"
- fi
-
@@ -75,7 +70,7 @@
- AC_MSG_WARN(Disabling selinux)
- fi
-
-- # With --enable-static_link and selinux enabled, linking lvm.static
+- # With --enable-static_link and selinux enabled, linking
- # fails on at least Debian unstable due to unsatisfied references
- # to pthread_mutex_lock and _unlock. See if we need -lpthread.
- if test "$STATIC_LINK-$HAVE_SELINUX" = yes-yes; then
@@ -92,7 +87,7 @@
dnl -- Check for realtime clock support
if test x$REALTIME = xyes; then
AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no)
-@@ -573,10 +516,6 @@
+@@ -597,10 +538,6 @@
AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
@@ -103,30 +98,29 @@
################################################################################
AC_PATH_PROG(MODPROBE_CMD, modprobe)
-@@ -608,13 +547,11 @@
- AC_SUBST(LDDEPS)
- AC_SUBST(LDFLAGS)
- AC_SUBST(LIB_SUFFIX)
--AC_SUBST(LIBS)
- AC_SUBST(LVM_VERSION)
- AC_SUBST(LVM1_FALLBACK)
- AC_SUBST(DEBUG)
- AC_SUBST(DEVMAPPER)
+@@ -638,12 +575,10 @@
+ AC_SUBST(GROUP)
AC_SUBST(HAVE_LIBDL)
--AC_SUBST(HAVE_SELINUX)
AC_SUBST(HAVE_REALTIME)
- AC_SUBST(CMDLIB)
- AC_SUBST(MSGFMT)
-@@ -630,7 +567,6 @@
- AC_SUBST(DMEVENTD)
- AC_SUBST(CFLOW_CMD)
- AC_SUBST(CSCOPE_CMD)
+-AC_SUBST(HAVE_SELINUX)
+ AC_SUBST(INTL)
+ AC_SUBST(INTL_PACKAGE)
+ AC_SUBST(JOBS)
+ AC_SUBST(LDDEPS)
+-AC_SUBST(LIBS)
+ AC_SUBST(LIB_SUFFIX)
+ AC_SUBST(LOCALEDIR)
+ AC_SUBST(LVM1)
+@@ -659,7 +594,6 @@
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
+ AC_SUBST(STATIC_LINK)
-AC_SUBST([LIB_PTHREAD])
################################################################################
dnl -- First and last lines should not contain files to generate in order to
---- trunk.orig/lib/activate/fs.c
-+++ trunk/lib/activate/fs.c
+--- a/lib/activate/fs.c
++++ b/lib/activate/fs.c
@@ -174,10 +174,8 @@
return 0;
}
More information about the pkg-lvm-commits
mailing list