r753 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Fri Oct 30 14:31:44 UTC 2009 

Author: waldi
Date: Fri Oct 30 14:31:44 2009
New Revision: 753

Log:
* debian/changelog: Update version to 2.02.54-1.
* debian/patches: Update patches.

Deleted:
   lvm2/trunk/debian/patches/drop-realtime.patch
   lvm2/trunk/debian/patches/libdm-abi.patch
   lvm2/trunk/debian/patches/libdm-type-kernel_dev_t.patch
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/patches/config.patch
   lvm2/trunk/debian/patches/force-modprobe.patch
   lvm2/trunk/debian/patches/install.patch
   lvm2/trunk/debian/patches/libdm-atomic.patch
   lvm2/trunk/debian/patches/libs-cleanup.patch
   lvm2/trunk/debian/patches/pkgconfig.patch
   lvm2/trunk/debian/patches/rules-subdir.patch
   lvm2/trunk/debian/patches/series

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/changelog	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,5 +1,6 @@
-lvm2 (2.02.53-3) UNRELEASED; urgency=low
+lvm2 (2.02.54-1) UNRELEASED; urgency=low
 
+  * New upstream version.
   * Remove notify rules, unused for now.
   * Add better documentation about the udev rules.
   * Update list of to be ignored hidden lvm subvolumes.

Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/config.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,6 +1,6 @@
 --- a/doc/example.conf
 +++ b/doc/example.conf
-@@ -305,7 +305,7 @@
+@@ -312,7 +312,7 @@
      # Full pathnames can be given.
  
      # Search this directory first for shared libraries.

Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/force-modprobe.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -917,11 +917,7 @@
+@@ -946,11 +946,7 @@
  fi
  
  ################################################################################

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/install.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,39 +1,40 @@
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
-@@ -163,21 +163,21 @@
+@@ -165,22 +165,17 @@
  endif
  
  install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
-+	$(INSTALL) -D liblvm2cmd.$(LIB_SUFFIX) \
- 		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
++	$(INSTALL) -D $< $(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_DATA) -D lvm2cmd.h \
- 		$(includedir)/lvm2cmd.h
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
+-		$(includedir)/lvm2cmd.h
++	$(INSTALL_DATA) -D $(srcdir)/lvm2cmd.h $(includedir)/lvm2cmd.h
  
  install_cmdlib_static: liblvm2cmd-static.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
-+	$(INSTALL) -D liblvm2cmd-static.a \
- 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
++	$(INSTALL) -D $< $(libdir)/liblvm2cmd.a.$(LIB_VERSION)
  	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
-+	$(INSTALL_DATA) -D lvm2cmd.h \
- 		$(includedir)/lvm2cmd.h
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
+-		$(includedir)/lvm2cmd.h
++	$(INSTALL) -D $(srcdir)/lvm2cmd.h $(includedir)/lvm2cmd.h
  
  install_tools_dynamic: lvm .commands
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
-+	$(INSTALL) -D lvm \
- 		$(sbindir)/lvm
+-		$(sbindir)/lvm
++	$(INSTALL) -D lvm $(sbindir)/lvm
  	@echo Creating symbolic links for individual commands in $(sbindir)
  	@( \
-@@ -188,14 +188,13 @@
+ 		for v in `cat $(srcdir)/.commands`; do \
+@@ -190,14 +185,13 @@
  	)
  
  install_tools_static: lvm.static
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 -		$(staticdir)/lvm.static
-+	$(INSTALL) -D lvm.static $(staticdir)/lvm.static
++	$(INSTALL) -D $< $(staticdir)/$<
  
  install_dmsetup_dynamic: dmsetup
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
@@ -47,7 +48,7 @@
  
 --- a/daemons/clvmd/Makefile.in
 +++ b/daemons/clvmd/Makefile.in
-@@ -97,8 +97,8 @@
+@@ -98,8 +98,8 @@
  .PHONY: install_clvmd
  
  install_clvmd: $(TARGETS)
@@ -60,8 +61,8 @@
  
 --- a/lib/format1/Makefile.in
 +++ b/lib/format1/Makefile.in
-@@ -31,7 +31,6 @@
- include $(top_srcdir)/make.tmpl
+@@ -32,7 +32,6 @@
+ include ../../make.tmpl
  
  install: liblvm2format1.so
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -71,8 +72,8 @@
  
 --- a/lib/format_pool/Makefile.in
 +++ b/lib/format_pool/Makefile.in
-@@ -28,8 +28,7 @@
- include $(top_srcdir)/make.tmpl
+@@ -29,8 +29,7 @@
+ include ../../make.tmpl
  
  install: liblvm2formatpool.so
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -83,8 +84,8 @@
  
 --- a/lib/locking/Makefile.in
 +++ b/lib/locking/Makefile.in
-@@ -24,8 +24,7 @@
- include $(top_srcdir)/make.tmpl
+@@ -25,8 +25,7 @@
+ include ../../make.tmpl
  
  install install_cluster: liblvm2clusterlock.so
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -95,8 +96,8 @@
  
 --- a/lib/mirror/Makefile.in
 +++ b/lib/mirror/Makefile.in
-@@ -24,7 +24,6 @@
- include $(top_srcdir)/make.tmpl
+@@ -25,7 +25,6 @@
+ include ../../make.tmpl
  
  install: liblvm2mirror.so
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -106,8 +107,8 @@
  
 --- a/lib/snapshot/Makefile.in
 +++ b/lib/snapshot/Makefile.in
-@@ -24,8 +24,7 @@
- include $(top_srcdir)/make.tmpl
+@@ -25,8 +25,7 @@
+ include ../../make.tmpl
  
  install: liblvm2snapshot.so
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -118,7 +119,7 @@
  
 --- a/man/Makefile.in
 +++ b/man/Makefile.in
-@@ -62,14 +62,14 @@
+@@ -63,14 +63,14 @@
  	@for f in $(MAN8); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \
@@ -135,7 +136,7 @@
  	done
  
  install_cluster:
-@@ -77,7 +77,7 @@
+@@ -78,7 +78,7 @@
  	@for f in $(MAN8CLUSTER); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \
@@ -144,7 +145,7 @@
  	done
  
  install_device-mapper:
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
  	@for f in $(MAN8DM); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \
@@ -155,29 +156,16 @@
  install: install_lvm2 install_device-mapper
 --- a/libdm/Makefile.in
 +++ b/libdm/Makefile.in
-@@ -57,11 +57,7 @@
- 	install_ioctl install_ioctl_static \
- 	install_pkgconfig
- 
--INSTALL_TYPE = install_dynamic
--
--ifeq ("@STATIC_LINK@", "yes")
--  INSTALL_TYPE += install_static
--endif
-+INSTALL_TYPE = install_dynamic install_static
- 
- ifeq ("@PKGCONFIG@", "yes")
-   INSTALL_TYPE += install_pkgconfig
-@@ -72,7 +68,7 @@
+@@ -73,7 +69,7 @@
  install_device-mapper: install
  
  install_include:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
-+	$(INSTALL_DATA) -D libdevmapper.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
++	$(INSTALL_DATA) -D $(srcdir)/libdevmapper.h \
  		$(includedir)/libdevmapper.h
  
  install_dynamic: install_ at interface@
-@@ -80,19 +76,17 @@
+@@ -81,19 +77,16 @@
  		$(libdir)/libdevmapper.$(LIB_SUFFIX)
  
  install_static: install_ at interface@_static
@@ -185,8 +173,8 @@
  
  install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -D $< \
- 		$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
+-		$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
++	$(INSTALL) -D $< $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
  
  install_pkgconfig:
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
@@ -202,41 +190,48 @@
  	rm -f $@
 --- a/daemons/dmeventd/Makefile.in
 +++ b/daemons/dmeventd/Makefile.in
-@@ -66,25 +66,21 @@
- install_device-mapper: $(INSTALL_TYPE) install_include install_dmeventd
+@@ -73,31 +73,29 @@
+ endif
  
  install_include:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \
--		$(includedir)/libdevmapper-event.h
-+	$(INSTALL) -D -m 644 libdevmapper-event.h $(includedir)/libdevmapper-event.h
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper-event.h \
++	$(INSTALL_DATA) $(srcdir)/libdevmapper-event.h \
+ 		$(includedir)/libdevmapper-event.h
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
++	$(INSTALL_DATA) libdevmapper-event.pc \
+ 		$(usrlibdir)/pkgconfig/devmapper-event.pc
  
- install_dynamic: libdevmapper-event.$(LIB_SUFFIX)
+ install_lib_dynamic: libdevmapper-event.$(LIB_SUFFIX)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 -		$(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
 +	$(INSTALL) -D $< $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
  	$(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
  		$(libdir)/libdevmapper-event.$(LIB_SUFFIX)
  
- install_dmeventd: dmeventd
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+	$(INSTALL) -D $< $(sbindir)/$<
- 
- install_pkgconfig:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
--		$(usrlibdir)/pkgconfig/devmapper-event.pc
-+	$(INSTALL) -D -m 644 libdevmapper-event.pc $(usrlibdir)/pkgconfig/devmapper-event.pc
- 
- install_static: libdevmapper-event.a
+ install_lib_static: libdevmapper-event.a
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 -		$(libdir)/libdevmapper-event.a.$(LIB_VERSION)
 +	$(INSTALL) -D $< $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
  	$(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
  
- $(VERSIONED_SHLIB): $(LIB_SHARED)
+ install_lib: $(INSTALL_LIB_TARGETS)
+ 
+ install_dmeventd_dynamic: dmeventd
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_dmeventd_static: dmeventd.static
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_dmeventd: $(INSTALL_DMEVENTD_TARGETS)
+ 
 --- a/daemons/dmeventd/plugins/mirror/Makefile.in
 +++ b/daemons/dmeventd/plugins/mirror/Makefile.in
-@@ -32,7 +32,7 @@
- include $(top_srcdir)/make.tmpl
+@@ -35,7 +35,7 @@
+ LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@
  
  install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -246,8 +241,8 @@
  
 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in
 +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
-@@ -32,7 +32,7 @@
- include $(top_srcdir)/make.tmpl
+@@ -35,7 +35,7 @@
+ LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@
  
  install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -257,12 +252,12 @@
  
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
-@@ -23,7 +23,7 @@
- install_lvm2:
+@@ -24,7 +24,7 @@
+ install_lvm2: $(CONFSRC)
  	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
  		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
--		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
-+		$(INSTALL_DATA) -D $(CONFSRC) \
+-		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $< \
++		$(INSTALL_DATA) -D $< \
  			$(confdir)/$(CONFDEST); \
  	fi
  
@@ -272,7 +267,7 @@
  RANLIB = @RANLIB@
  SHELL = /bin/sh
  INSTALL = @INSTALL@
-+INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_DATA = @INSTALL@ -m 644
  MKDIR_P = @MKDIR_P@
  MSGFMT = @MSGFMT@
  LCOV = @LCOV@
@@ -288,37 +283,28 @@
  # The number of jobs to run, if blank, defaults to the make standard
  ifndef MAKEFLAGS
  MAKEFLAGS = @JOBS@
-@@ -107,9 +103,6 @@
- #CFLAGS += -pg
- #LDFLAGS += -pg
- 
--STRIP=
--#STRIP = -s
--
- LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
- 
- LIB_VERSION_LVM := $(shell cat $(top_srcdir)/VERSION | \
 --- a/scripts/Makefile.in
 +++ b/scripts/Makefile.in
-@@ -18,12 +18,12 @@
- include $(top_srcdir)/make.tmpl
+@@ -19,13 +19,10 @@
+ include ../make.tmpl
  
  install:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \
-+	$(INSTALL) -D lvm_dump.sh \
- 		$(sbindir)/lvmdump
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) vgimportclone.sh \
-+	$(INSTALL) -D vgimportclone.sh \
- 		$(sbindir)/vgimportclone
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \
+-		$(sbindir)/lvmdump
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/vgimportclone.sh \
+-		$(sbindir)/vgimportclone
++	$(INSTALL) -D $(srcdir)/lvm_dump.sh $(sbindir)/lvmdump
++	$(INSTALL) -D $(srcdir)/vgimportclone.sh $(sbindir)/vgimportclone
  ifeq ("@FSADM@", "yes")
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm.sh \
-+	$(INSTALL) -D fsadm.sh \
- 		$(sbindir)/fsadm
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/fsadm.sh \
+-		$(sbindir)/fsadm
++	$(INSTALL) -D $(srcdir)/fsadm.sh $(sbindir)/fsadm
  endif
  
+ install_lvm2: install
 --- a/po/Makefile.in
 +++ b/po/Makefile.in
-@@ -53,13 +53,13 @@
+@@ -54,13 +54,13 @@
  	@echo Installing translation files in $(localedir)
  	@( \
  		for lang in $(LANGS); do \
@@ -334,3 +320,110 @@
  			    $(localedir)/$$lang/LC_MESSAGES/device-mapper.mo;\
  	  done; \
  	)
+--- a/liblvm/Makefile.in
++++ b/liblvm/Makefile.in
+@@ -67,22 +67,19 @@
+ install: $(INSTALL_TYPE) install_include
+ 
+ install_include:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2app.h $(includedir)/lvm2app.h
++	$(INSTALL_DATA) -D $(srcdir)/lvm2app.h $(includedir)/lvm2app.h
+ 
+ install_dynamic: $(LIB_SHARED)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/$(LIB_SHARED).$(LIB_VERSION_APP)
++	$(INSTALL) -D $< $(libdir)/$(LIB_SHARED).$(LIB_VERSION_APP)
+ 	$(LN_S) -f $(LIB_SHARED).$(LIB_VERSION_APP) \
+ 		$(libdir)/$(LIB_SHARED)
+ 
+ install_static: $(LIB_STATIC)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/$(LIB_STATIC).$(LIB_VERSION_APP)
++	$(INSTALL) -D $< $(libdir)/$(LIB_STATIC).$(LIB_VERSION_APP)
+ 	$(LN_S) -f $(LIB_STATIC).$(LIB_VERSION_APP) $(libdir)/$(LIB_STATIC)
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(LIB_NAME).pc \
+-		$(usrlibdir)/pkgconfig/lvm2app.pc
++	$(INSTALL_DATA) -D $(LIB_NAME).pc $(usrlibdir)/pkgconfig/lvm2app.pc
+ 
+ liblvm.cflow: $(SOURCES)
+ 	set -e; (echo -n "SOURCES += "; \
+--- a/daemons/cmirrord/Makefile.in
++++ b/daemons/cmirrord/Makefile.in
+@@ -36,5 +36,4 @@
+ 		$(LVMLIBS) $(LMLIBS) $(LIBS)
+ 
+ install: $(TARGETS)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) cmirrord \
+-		$(usrsbindir)/cmirrord
++	$(INSTALL) -D cmirrord $(usrsbindir)/cmirrord
+--- a/udev/Makefile.in
++++ b/udev/Makefile.in
+@@ -32,7 +32,7 @@
+ 	@for f in $(LVM_RULES); \
+ 	do \
+ 	   $(RM) $(udevdir)/$$f; \
+-	   $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $(srcdir)/$$f $(udevdir)/$$f; \
++	   $(INSTALL_DATA) -c -D $(srcdir)/$$f $(udevdir)/$$f; \
+ 	done
+ 
+ install_device-mapper: $(DM_RULES)
+@@ -40,7 +40,7 @@
+ 	@for f in $(DM_RULES); \
+ 	do \
+ 	   $(RM) $(udevdir)/$$f; \
+-	   $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $(srcdir)/$$f $(udevdir)/$$f; \
++	   $(INSTALL_DATA) -c -D $(srcdir)/$$f $(udevdir)/$$f; \
+ 	done
+ 
+ install: install_lvm2 install_device-mapper
+--- a/configure.in
++++ b/configure.in
+@@ -144,28 +144,25 @@
+ ################################################################################
+ dnl -- Setup the ownership of the files
+ AC_MSG_CHECKING(file owner)
+-OWNER=""
+-
+ AC_ARG_WITH(user,
+   [  --with-user=USER        Set the owner of installed files [[USER=]] ],
+   [ OWNER="$withval" ])
+ AC_MSG_RESULT($OWNER)
+ 
+ if test x$OWNER != x; then
+-	OWNER="-o $OWNER"
++	INSTALL="$INSTALL -o $OWNER"
+ fi
+ 
+ ################################################################################
+ dnl -- Setup the group ownership of the files
+ AC_MSG_CHECKING(group owner)
+-GROUP=""
+ AC_ARG_WITH(group,
+   [  --with-group=GROUP      Set the group owner of installed files [[GROUP=]] ],
+   [ GROUP="$withval" ])
+ AC_MSG_RESULT($GROUP)
+ 
+ if test x$GROUP != x; then
+-	GROUP="-g $GROUP"
++	INSTALL="$INSTALL -g $GROUP"
+ fi
+ 
+ ################################################################################
+@@ -1092,7 +1089,6 @@
+ AC_SUBST(DM_LIB_VERSION)
+ AC_SUBST(DM_LIB_PATCHLEVEL)
+ AC_SUBST(FSADM)
+-AC_SUBST(GROUP)
+ AC_SUBST(GULM_CFLAGS)
+ AC_SUBST(GULM_LIBS)
+ AC_SUBST(HAVE_LIBDL)
+@@ -1116,7 +1112,6 @@
+ AC_SUBST(LVM_RELEASE_DATE)
+ AC_SUBST(MIRRORS)
+ AC_SUBST(MSGFMT)
+-AC_SUBST(OWNER)
+ AC_SUBST(PKGCONFIG)
+ AC_SUBST(POOL)
+ AC_SUBST(QUORUM_CFLAGS)

Modified: lvm2/trunk/debian/patches/libdm-atomic.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-atomic.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/libdm-atomic.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,8 +1,8 @@
 --- a/libdm/libdm-common.c
 +++ b/libdm/libdm-common.c
-@@ -336,12 +336,19 @@
+@@ -404,12 +404,19 @@
  static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
- 			 uid_t uid, gid_t gid, mode_t mode)
+ 			 uid_t uid, gid_t gid, mode_t mode, int check_udev)
  {
 -	char path[PATH_MAX];
 +	char path[PATH_MAX], tmppath[PATH_MAX];
@@ -21,7 +21,7 @@
  
  	if (stat(path, &info) >= 0) {
  		if (!S_ISBLK(info.st_mode)) {
-@@ -364,24 +371,33 @@
+@@ -432,24 +439,33 @@
  			 "node creation.", path);
  
  	old_mask = umask(0);
@@ -61,4 +61,4 @@
 +	return 0;
  }
  
- static int _rm_dev_node(const char *dev_name)
+ static int _rm_dev_node(const char *dev_name, int check_udev)

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -8,7 +8,7 @@
  		LIB_SUFFIX=so
  		DEVMAPPER=yes
  		ODIRECT=yes
-@@ -776,24 +775,6 @@
+@@ -783,24 +782,6 @@
  fi;
  
  ################################################################################
@@ -33,7 +33,7 @@
  dnl -- Check for dlopen
  AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
  
-@@ -824,34 +805,9 @@
+@@ -831,35 +812,9 @@
  ################################################################################
  dnl -- Check for selinux
  if test x$SELINUX = xyes; then
@@ -42,17 +42,18 @@
 -	if test x$HAVE_SEPOL = xyes; then
 -		AC_DEFINE([HAVE_SEPOL], 1,
 -		  [Define to 1 if sepol_check_context is available.])
--		LIBS="-lsepol $LIBS"
+-		SELINUX_LIBS="-lsepol $SELINUX_LIBS"
 -	fi
 -
 -	AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
 -
 -	if test x$HAVE_SELINUX = xyes; then
 -		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
--		LIBS="-lselinux $LIBS"
+-		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
 -	else
 -		AC_MSG_WARN(Disabling selinux)
 -	fi
+-	LIBS="$SELINUX_LIBS $LIBS"
 -
 -	# With --enable-static_link and selinux enabled, linking
 -	# fails on at least Debian unstable due to unsatisfied references
@@ -71,7 +72,7 @@
  fi
  
  ################################################################################
-@@ -875,7 +831,7 @@
+@@ -883,7 +838,7 @@
  dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
  if test x$READLINE != xno; then
  	rl_found=yes
@@ -80,7 +81,7 @@
  	test x$READLINE:$rl_found = xyes:no &&
  	  AC_MSG_ERROR(
  GNU Readline could not be found which is required for the
-@@ -1092,6 +1048,9 @@
+@@ -1099,6 +1054,9 @@
  AC_SUBST(JOBS)
  AC_SUBST(LDDEPS)
  AC_SUBST(LIBS)
@@ -90,7 +91,7 @@
  AC_SUBST(LIB_SUFFIX)
  AC_SUBST(LOCALEDIR)
  AC_SUBST(LVM1)
-@@ -1118,7 +1077,6 @@
+@@ -1125,7 +1083,6 @@
  AC_SUBST(STATICDIR)
  AC_SUBST(STATIC_LINK)
  AC_SUBST(UDEV_RULES)
@@ -100,7 +101,16 @@
  AC_SUBST(missingkernel)
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
-@@ -102,6 +102,9 @@
+@@ -17,8 +17,6 @@
+ top_builddir = @top_builddir@
+ VPATH = @srcdir@
+ 
+-LIB_PTHREAD = @LIB_PTHREAD@
+-
+ SOURCES =\
+ 	dumpconfig.c \
+ 	formats.c \
+@@ -105,6 +103,9 @@
  
  LVMLIBS += -ldevmapper
  
@@ -109,48 +119,53 @@
 +
  DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
  
- include $(top_srcdir)/make.tmpl
-@@ -114,14 +117,13 @@
+ include ../make.tmpl
+@@ -113,22 +114,21 @@
+ 
+ dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
+-	      -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
++	      -o $@ dmsetup.o -ldevmapper $(LIBS)
  
  dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
- 	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
--	      -L$(interfacedir) -ldevmapper $(LIBS) \
--	      $(LIB_PTHREAD)
-+	      -L$(interfacedir) -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
+-	      -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
++	      -o $@ dmsetup.o -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
  
  all: device-mapper
  
- lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a
- 	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
--		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
-+		$(LDFLAGS) $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM) -rdynamic
+ lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
+-		$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
++		$(LVMLIBS) $(LIBS) $(LDFLAGS_LVM)
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ \
+-	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) \
+-	      -rdynamic
++	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM)
  
- LIB_PTHREAD = @LIB_PTHREAD@
- lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
+ 	cat $(top_builddir)/lib/liblvm-internal.a > $@
 --- a/daemons/dmeventd/Makefile.in
 +++ b/daemons/dmeventd/Makefile.in
-@@ -46,7 +46,7 @@
+@@ -62,11 +62,11 @@
  
  dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
- 	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
--	-L. -ldevmapper-event $(LIBS) -rdynamic
-+	-L. -ldevmapper-event
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
+-	$(LVMLIBS) $(LIBS) -rdynamic
++	$(LVMLIBS) $(LIBS)
+ 
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacedir)/libdevmapper.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacedir) -o $@ \
+-	dmeventd.o $(LVMLIBS) $(LIBS) -rdynamic
++	dmeventd.o $(LVMLIBS) $(LIBS)
  
- .PHONY: install_dynamic install_static install_include \
- 	install_pkgconfig install_dmeventd
+ ifeq ("@PKGCONFIG@", "yes")
+   INSTALL_LIB_TARGETS += install_pkgconfig
 --- a/libdm/Makefile.in
 +++ b/libdm/Makefile.in
-@@ -34,9 +34,7 @@
- 
- INCLUDES = -I$(interface) -I.
- 
--ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
--endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
-   LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -46,6 +44,8 @@
+@@ -47,6 +47,8 @@
  VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
  LIB_VERSION = $(LIB_VERSION_DM)
  
@@ -167,9 +182,9 @@
  #CFLAGS += -pg
 -#LDFLAGS += -pg
  
- LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
- 
-@@ -201,13 +200,13 @@
+ STRIP=
+ #STRIP = -s
+@@ -205,13 +204,13 @@
  ifeq ("@LIB_SUFFIX@","so")
  $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
  	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \

Modified: lvm2/trunk/debian/patches/pkgconfig.patch
==============================================================================
--- lvm2/trunk/debian/patches/pkgconfig.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/pkgconfig.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -4,5 +4,5 @@
  Version: @DM_LIB_PATCHLEVEL@
  Cflags: -I${includedir} 
  Libs: -L${libdir} -ldevmapper
--Libs.private: -lselinux -lsepol
+-Libs.private: @SELINUX_LIBS@
 +Requires.private: libselinux

Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,6 +1,6 @@
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
-@@ -124,65 +124,27 @@
+@@ -128,65 +128,27 @@
  
  .PHONY: all install install_cluster pofile distclean clean cflow device-mapper 
  .PHONY: install_device-mapper install_lvm2
@@ -78,7 +78,7 @@
  endif
  
  $(TARGETS): $(OBJECTS)
-@@ -229,12 +191,12 @@
+@@ -234,12 +196,12 @@
  %.mo: %.po
  	$(MSGFMT) -o $@ $<
  
@@ -95,7 +95,7 @@
  	      $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
    SUBDIRS += po
  endif
  
@@ -104,7 +104,7 @@
  
  ifeq ("@APPLIB@", "yes")
    SUBDIRS += liblvm
-@@ -53,31 +53,6 @@
+@@ -54,31 +54,6 @@
  
  include make.tmpl
  
@@ -138,7 +138,7 @@
  	@CSCOPE_CMD@ -b -R
 --- a/man/Makefile.in
 +++ b/man/Makefile.in
-@@ -48,9 +48,7 @@
+@@ -49,9 +49,7 @@
  
  .PHONY: man
  

Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series	Mon Oct 12 03:25:28 2009	(r752)
+++ lvm2/trunk/debian/patches/series	Fri Oct 30 14:31:44 2009	(r753)
@@ -1,11 +1,9 @@
 install.patch
 libs-cleanup.patch
-drop-realtime.patch
 config.patch
 force-modprobe.patch
-libdm-type-kernel_dev_t.patch
 pkgconfig.patch
-libdm-abi.patch
 libdm-atomic.patch
 rules-subdir.patch
 implicit-pointer.patch
+libdm-static.patch

More information about the pkg-lvm-commits mailing list