r802 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Sat May 15 15:23:37 UTC 2010
Author: waldi
Date: Sat May 15 15:23:36 2010
New Revision: 802
Log:
* debian/changelog: Set version to 2.02.64-1.
* debian/clvm.install: Update clvmd location.
* debian/libdevmapper-dev.install: Don't install static lib.
* debian/libdevmapper1.02.1.symbols: Add new symbols.
* debian/patches: Update patches.
Deleted:
lvm2/trunk/debian/patches/libdm-event-static.patch
lvm2/trunk/debian/patches/libdm-static.patch
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/clvm.install
lvm2/trunk/debian/libdevmapper-dev.install
lvm2/trunk/debian/libdevmapper1.02.1.symbols
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 Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/changelog Sat May 15 15:23:36 2010 (r802)
@@ -1,3 +1,10 @@
+lvm2 (2.02.64-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * Don't longer build static libraries.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 15 May 2010 14:38:31 +0000
+
lvm2 (2.02.62-1) unstable; urgency=low
* New upstream version.
Modified: lvm2/trunk/debian/clvm.install
==============================================================================
--- lvm2/trunk/debian/clvm.install Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/clvm.install Sat May 15 15:23:36 2010 (r802)
@@ -1,2 +1,2 @@
-sbin/clvmd
+usr/sbin/clvmd
usr/share/man/man8/clvmd*
Modified: lvm2/trunk/debian/libdevmapper-dev.install
==============================================================================
--- lvm2/trunk/debian/libdevmapper-dev.install Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/libdevmapper-dev.install Sat May 15 15:23:36 2010 (r802)
@@ -1,3 +1,2 @@
usr/include/libdevmapper.h
-usr/lib/libdevmapper.a
usr/lib/pkgconfig
Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols Sat May 15 15:23:36 2010 (r802)
@@ -2,11 +2,13 @@
Base at Base 2:1.02.20
dm_asprintf at Base 2:1.02.20
dm_basename at Base 2:1.02.20
+ dm_bit_and at Base 2:1.02.47
dm_bit_get_first at Base 2:1.02.20
dm_bit_get_next at Base 2:1.02.20
dm_bit_union at Base 2:1.02.20
dm_bitset_create at Base 2:1.02.20
dm_bitset_destroy at Base 2:1.02.20
+ dm_bitset_equal at Base 2:1.02.47
dm_bounds_check_debug at Base 2:1.02.20
dm_cookie_supported at Base 2:1.02.36
dm_create_dir at Base 2:1.02.24
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Sat May 15 15:23:36 2010 (r802)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -928,11 +928,7 @@
+@@ -931,11 +931,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/install.patch Sat May 15 15:23:36 2010 (r802)
@@ -1,266 +1,3 @@
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -164,22 +164,17 @@
- endif
-
- install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-- $(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 $(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) $< \
-- $(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 $(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 \
-- $(sbindir)/lvm
-+ $(INSTALL) -D lvm $(sbindir)/lvm
- @echo Creating symbolic links for individual commands in $(sbindir)
- @( \
- for v in `cat $(srcdir)/.commands`; do \
-@@ -189,14 +184,13 @@
- )
-
- install_tools_static: lvm.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(staticdir)/lvm.static
-+ $(INSTALL) -D $< $(staticdir)/$<
-
- install_dmsetup_dynamic: dmsetup
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+ $(INSTALL) -D $< $(sbindir)/$<
-
- install_dmsetup_static: dmsetup.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+ $(INSTALL) -D $< $(sbindir)/$<
-
- install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
-
---- a/daemons/clvmd/Makefile.in
-+++ b/daemons/clvmd/Makefile.in
-@@ -99,8 +99,8 @@
- .PHONY: install_clvmd
-
- install_clvmd: $(TARGETS)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \
-- $(usrsbindir)/clvmd
-+ $(INSTALL) -D clvmd \
-+ $(sbindir)/clvmd
-
- install: $(INSTALL_TARGETS)
-
---- a/lib/format1/Makefile.in
-+++ b/lib/format1/Makefile.in
-@@ -32,7 +32,6 @@
- include $(top_builddir)/make.tmpl
-
- install: liblvm2format1.so
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/liblvm2format1.so.$(LIB_VERSION)
-+ $(INSTALL) -D $< $(libdir)/liblvm2format1.so.$(LIB_VERSION)
- $(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so
-
---- a/lib/format_pool/Makefile.in
-+++ b/lib/format_pool/Makefile.in
-@@ -29,8 +29,7 @@
- include $(top_builddir)/make.tmpl
-
- install: liblvm2formatpool.so
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/liblvm2formatpool.so.$(LIB_VERSION)
-+ $(INSTALL) -D $< $(libdir)/liblvm2formatpool.so.$(LIB_VERSION)
- $(LN_S) -f liblvm2formatpool.so.$(LIB_VERSION) \
- $(libdir)/liblvm2formatpool.so
-
---- a/lib/locking/Makefile.in
-+++ b/lib/locking/Makefile.in
-@@ -25,8 +25,7 @@
- include $(top_builddir)/make.tmpl
-
- install install_cluster: liblvm2clusterlock.so
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/liblvm2clusterlock.so.$(LIB_VERSION)
-+ $(INSTALL) -D $< $(libdir)/liblvm2clusterlock.so.$(LIB_VERSION)
- $(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \
- $(libdir)/liblvm2clusterlock.so
-
---- a/lib/mirror/Makefile.in
-+++ b/lib/mirror/Makefile.in
-@@ -25,7 +25,6 @@
- include $(top_builddir)/make.tmpl
-
- install: liblvm2mirror.so
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/liblvm2mirror.so.$(LIB_VERSION)
-+ $(INSTALL) -D $< $(libdir)/liblvm2mirror.so.$(LIB_VERSION)
- $(LN_S) -f liblvm2mirror.so.$(LIB_VERSION) $(libdir)/liblvm2mirror.so
-
---- a/lib/snapshot/Makefile.in
-+++ b/lib/snapshot/Makefile.in
-@@ -25,8 +25,7 @@
- include $(top_builddir)/make.tmpl
-
- install: liblvm2snapshot.so
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/liblvm2snapshot.so.$(LIB_VERSION)
-+ $(INSTALL) -D $< $(libdir)/liblvm2snapshot.so.$(LIB_VERSION)
- $(LN_S) -f liblvm2snapshot.so.$(LIB_VERSION) \
- $(libdir)/liblvm2snapshot.so
-
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -72,14 +72,14 @@
- @for f in $(MAN8); \
- do \
- $(RM) $(MAN8DIR)/$$f; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-+ $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
- done
-
- @echo "Installing $(MAN5) in $(MAN5DIR)"
- @for f in $(MAN5); \
- do \
- $(RM) $(MAN5DIR)/$$f; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
-+ $(INSTALL_DATA) -D $$f $(MAN5DIR)/$$f; \
- done
-
- install_cluster:
-@@ -87,7 +87,7 @@
- @for f in $(MAN8CLUSTER); \
- do \
- $(RM) $(MAN8DIR)/$$f; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-+ $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
- done
-
- install_device-mapper:
-@@ -95,7 +95,7 @@
- @for f in $(MAN8DM); \
- do \
- $(RM) $(MAN8DIR)/$$f; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-+ $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
- done
-
- install: install_lvm2 install_device-mapper
---- a/libdm/Makefile.in
-+++ b/libdm/Makefile.in
-@@ -75,7 +75,7 @@
- install_device-mapper: install
-
- install_include:
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
-+ $(INSTALL_DATA) -D $(srcdir)/libdevmapper.h \
- $(includedir)/libdevmapper.h
-
- install_dynamic: install_ at interface@
-@@ -83,19 +83,16 @@
- $(libdir)/libdevmapper.$(LIB_SUFFIX)
-
- install_static: install_ at interface@_static
-- $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
-
- install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(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 \
-+ $(INSTALL_DATA) -D libdevmapper.pc \
- $(usrlibdir)/pkgconfig/devmapper.pc
-
- install_ioctl_static: ioctl/libdevmapper.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
-+ $(INSTALL) -D $< $(usrlibdir)/libdevmapper.a
-
- $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
- rm -f $@
---- a/daemons/dmeventd/Makefile.in
-+++ b/daemons/dmeventd/Makefile.in
-@@ -72,31 +72,29 @@
- endif
-
- install_include:
-- $(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_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_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
-
- 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
-@@ -35,7 +35,6 @@
- LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
-
- install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/$<
-+ $(INSTALL) -D $< $(libdir)/$<
-
- install: install_lvm2
---- a/daemons/dmeventd/plugins/snapshot/Makefile.in
-+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
-@@ -35,7 +35,6 @@
- LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
-
- install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-- $(libdir)/$<
-+ $(INSTALL) -D $< $(libdir)/$<
-
- install: install_lvm2
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -24,7 +24,7 @@
- install_lvm2: $(CONFSRC)
- @if [ ! -e $(confdir)/$(CONFDEST) ]; then \
- echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $< \
-+ $(INSTALL_DATA) -D $< \
- $(confdir)/$(CONFDEST); \
- fi
-
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -21,6 +21,7 @@
@@ -271,159 +8,25 @@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
LCOV = @LCOV@
-@@ -66,11 +67,6 @@
- interface = @interface@
- interfacebuilddir = $(top_builddir)/libdm/$(interface)
-
--# setup misc variables
--# define the ownership variables for the binaries and man pages
--OWNER = @OWNER@
--GROUP = @GROUP@
--
- # The number of jobs to run, if blank, defaults to the make standard
- ifndef MAKEFLAGS
+@@ -80,18 +81,9 @@
MAKEFLAGS = @JOBS@
---- a/scripts/Makefile.in
-+++ b/scripts/Makefile.in
-@@ -19,13 +19,10 @@
- include $(top_builddir)/make.tmpl
-
- install:
-- $(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 $(srcdir)/fsadm.sh \
-- $(sbindir)/fsadm
-+ $(INSTALL) -D $(srcdir)/fsadm.sh $(sbindir)/fsadm
endif
- install_lvm2: install
---- a/po/Makefile.in
-+++ b/po/Makefile.in
-@@ -54,13 +54,13 @@
- @echo Installing translation files in $(localedir)
- @( \
- for lang in $(LANGS); do \
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
-+ $(INSTALL_DATA) -D $$lang.mo \
- $(localedir)/$$lang/LC_MESSAGES/lvm2.mo;\
- done; \
- )
- @( \
- for lang in $(LANGS); do \
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
-+ $(INSTALL_DATA) -D $$lang.mo \
- $(localedir)/$$lang/LC_MESSAGES/device-mapper.mo;\
- done; \
- )
---- a/liblvm/Makefile.in
-+++ b/liblvm/Makefile.in
-@@ -68,22 +68,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)
+-# Handle installation of files
+-ifeq ("@WRITE_INSTALL@", "yes")
+-# leaving defaults
+-M_INSTALL_PROGRAM =
+-M_INSTALL_DATA = -m 644
+-else
+-M_INSTALL_PROGRAM = -m 555
+-M_INSTALL_DATA = -m 444
+-endif
+-INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
+-INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
+-INSTALL_WDATA = $(INSTALL) -p -m 644
++INSTALL_PROGRAM = $(INSTALL)
++INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_WDATA = $(INSTALL_DATA)
- if test x$GROUP != x; then
-- GROUP="-g $GROUP"
-+ INSTALL="$INSTALL -g $GROUP"
- fi
+ .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
- ################################################################################
-@@ -1083,7 +1080,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)
-@@ -1106,7 +1102,6 @@
- AC_SUBST(LVM_RELEASE_DATE)
- AC_SUBST(MIRRORS)
- AC_SUBST(MSGFMT)
--AC_SUBST(OWNER)
- AC_SUBST(PKGCONFIG)
- AC_SUBST(POOL)
- AC_SUBST(PTHREAD_LIBS)
Modified: lvm2/trunk/debian/patches/libdm-atomic.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-atomic.patch Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/libdm-atomic.patch Sat May 15 15:23:36 2010 (r802)
@@ -1,6 +1,6 @@
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
-@@ -406,12 +406,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, int check_udev)
{
@@ -21,7 +21,7 @@
if (stat(path, &info) >= 0) {
if (!S_ISBLK(info.st_mode)) {
-@@ -435,24 +442,33 @@
+@@ -433,24 +440,33 @@
"node creation.", path);
old_mask = umask(0);
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Sat May 15 15:23:36 2010 (r802)
@@ -8,7 +8,7 @@
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
-@@ -820,18 +819,9 @@
+@@ -823,18 +822,9 @@
################################################################################
dnl -- Check for selinux
if test x$SELINUX = xyes; then
@@ -30,7 +30,7 @@
fi
################################################################################
-@@ -852,49 +842,6 @@
+@@ -855,49 +845,6 @@
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
################################################################################
@@ -80,7 +80,7 @@
dnl -- Internationalisation stuff
AC_MSG_CHECKING(whether to enable internationalisation)
AC_ARG_ENABLE(nls, [ --enable-nls Enable Native Language Support],
-@@ -952,7 +899,7 @@
+@@ -955,7 +902,7 @@
################################################################################
dnl -- Ensure additional headers required
if test x$READLINE = xyes; then
@@ -89,7 +89,7 @@
fi
if test x$CLVMD != xnone; then
-@@ -1089,6 +1036,9 @@
+@@ -1093,6 +1040,9 @@
AC_SUBST(JOBS)
AC_SUBST(LDDEPS)
AC_SUBST(LIBS)
@@ -101,19 +101,14 @@
AC_SUBST(LVM1)
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
-@@ -53,7 +53,8 @@
+@@ -53,11 +53,12 @@
all: device-mapper
device-mapper: $(TARGETS)
--LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS)
+CLDFLAGS += -ldevmapper
-+LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS)
+ LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS)
- $(VERSIONED_SHLIB): $(LIB_SHARED)
- $(RM) -f $@
-@@ -61,7 +62,7 @@
-
- dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
+ dmeventd: $(LIB_SHARED) dmeventd.o
$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
+ $(DL_LIBS) $(LVMLIBS) $(LIBS)
@@ -122,7 +117,7 @@
$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
-@@ -49,6 +49,8 @@
+@@ -47,6 +47,8 @@
include $(top_builddir)/make.tmpl
@@ -133,7 +128,7 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -114,7 +114,6 @@
+@@ -127,7 +127,6 @@
#DEFS += -DBOUNDS_CHECK
#CFLAGS += -pg
@@ -141,19 +136,17 @@
STRIP=
#STRIP = -s
-@@ -218,13 +217,13 @@
+@@ -283,11 +282,11 @@
+ $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
ifeq ("@LIB_SUFFIX@","so")
- $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
- $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+ $(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
+ $(CC) -shared -Wl,-soname,$(notdir $@) \
+- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++ $(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
endif
-
ifeq ("@LIB_SUFFIX@","dylib")
- $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+ $(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
+- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++ $(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
endif
- %.so: %.a
+ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
Modified: lvm2/trunk/debian/patches/pkgconfig.patch
==============================================================================
--- lvm2/trunk/debian/patches/pkgconfig.patch Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/pkgconfig.patch Sat May 15 15:23:36 2010 (r802)
@@ -4,5 +4,5 @@
Version: @DM_LIB_PATCHLEVEL@
Cflags: -I${includedir}
Libs: -L${libdir} -ldevmapper
--Libs.private: @SELINUX_LIBS@
+-Libs.private: @SELINUX_LIBS@ @UDEV_LIBS@
+Requires.private: libselinux
Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/rules-subdir.patch Sat May 15 15:23:36 2010 (r802)
@@ -1,9 +1,9 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -141,65 +141,27 @@
-
- .PHONY: all install install_cluster pofile distclean clean cflow device-mapper
- .PHONY: install_device-mapper install_lvm2
+@@ -155,63 +155,24 @@
+ .PHONY: all pofile distclean clean cleandir cflow device-mapper
+ .PHONY: install install_cluster install_device-mapper install_lvm2
+ .PHONY: install_lib_shared install_lib_shared_plugin
-.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
-.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
-.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -18,7 +18,7 @@
-SUBDIRS.clean := $(SUBDIRS:=.clean)
-SUBDIRS.distclean := $(SUBDIRS:=.distclean)
- TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB)
+ TARGETS += $(LIB_SHARED) $(LIB_STATIC)
-all: $(SUBDIRS) $(TARGETS)
+all: subdirs-all $(TARGETS)
@@ -27,13 +27,23 @@
-install_cluster: all $(SUBDIRS.install_cluster)
-install_device-mapper: $(SUBDIRS.install_device-mapper)
-install_lvm2: $(SUBDIRS.install_lvm2)
--
+-cflow: $(SUBDIRS.cflow)
++install: subdirs-install
++install_cluster: subdirs-install_cluster
++install_device-mapper: subdirs-install_device-mapper
++install_lvm2: subdirs-install_lvm2
+
-$(SUBDIRS): $(SUBDIRS.device-mapper)
- $(MAKE) -C $@
--
++subdirs-%:
++ + at set -e; for subdir in $(SUBDIRS); do \
++ $(MAKE) -C $$subdir $(patsubst subdirs-%,%,$@); \
++ done
+
-$(SUBDIRS.device-mapper):
- $(MAKE) -C $(@:.device-mapper=) device-mapper
--
++pofile: subdirs-pofile $(POTFILES)
+
-$(SUBDIRS.install): $(SUBDIRS)
- $(MAKE) -C $(@:.install=) install
-
@@ -51,51 +61,35 @@
-
-$(SUBDIRS.distclean):
- -$(MAKE) -C $(@:.distclean=) distclean
-+install: subdirs-install
-+install_cluster: subdirs-install_cluster
-+install_device-mapper: subdirs-install_device-mapper
-+install_lvm2: subdirs-install_lvm2
-+
-+subdirs-%:
-+ + at set -e; for subdir in $(SUBDIRS); do \
-+ $(MAKE) -C $$subdir $(patsubst subdirs-%,%,$@); \
-+ done
-
- ifeq ("@INTL@", "yes")
+-
+-$(SUBDIRS.cflow):
+- $(MAKE) -C $(@:.cflow=) cflow
+-
+-ifeq ("@INTL@", "yes")
-pofile: $(SUBDIRS.pofile) $(POTFILES)
-
-$(SUBDIRS.pofile):
- $(MAKE) -C $(@:.pofile=) pofile
-+pofile: subdirs-pofile $(POTFILES)
- endif
-
- ifneq ("@CFLOW_CMD@", "")
--cflow: $(SUBDIRS.cflow)
--
--$(SUBDIRS.cflow):
-- $(MAKE) -C $(@:.cflow=) cflow
+-endif
+cflow: subdirs-cflow
- endif
- $(TARGETS): $(OBJECTS)
-@@ -247,12 +209,12 @@
- %.mo: %.po
- $(MSGFMT) -o $@ $<
-
--clean: $(SUBDIRS.clean)
-+clean: subdirs-clean
- $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
- $(SOURCES2:%.c=%.d) $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \
- $(SOURCES:%.c=%.gcda) $(LDDEPS)
-
--distclean: $(SUBDIRS.distclean)
-+distclean: subdir-distclean
- $(RM) -rf $(DISTCLEAN_DIRS)
- $(RM) $(DISTCLEAN_TARGETS) \
- $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
+ ifneq ("$(CFLOW_LIST_TARGET)", "")
+ CLEAN_CFLOW += $(CFLOW_LIST_TARGET)
+@@ -328,9 +289,9 @@
+ $(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
+ $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
+
+-clean: $(SUBDIRS.clean) cleandir
++clean: subdirs-clean cleandir
+
+-distclean: cleandir $(SUBDIRS.distclean)
++distclean: cleandir subdirs-distclean
+ test -z "$(DISTCLEAN_DIRS)" || $(RM) -r $(DISTCLEAN_DIRS)
+ $(RM) $(DISTCLEAN_TARGETS) Makefile core
+
--- a/Makefile.in
+++ b/Makefile.in
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
SUBDIRS += po
endif
@@ -104,7 +98,7 @@
ifeq ("@APPLIB@", "yes")
SUBDIRS += liblvm
-@@ -54,31 +54,6 @@
+@@ -42,32 +42,6 @@
include make.tmpl
@@ -128,19 +122,20 @@
-pofile: po.pofile
-endif
-
--ifneq ("@CFLOW_CMD@", "")
--tools.cflow: lib.cflow
--cflow: tools.cflow
+-ifneq ("$(CFLOW_CMD)", "")
+-tools.cflow: libdm.cflow lib.cflow
+-daemons.cflow: tools.cflow
+-cflow: include.cflow
-endif
-
ifneq ("@CSCOPE_CMD@", "")
- cscope.out: tools
- @CSCOPE_CMD@ -b -R
+ cscope.out:
+ @CSCOPE_CMD@ -b -R -s$(top_srcdir)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -58,9 +58,7 @@
- .PHONY: man
+ .PHONY: man install_man5 install_man8
-device-mapper: $(MAN8DM)
-
@@ -151,7 +146,7 @@
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
-@@ -18,10 +18,6 @@
+@@ -17,10 +17,6 @@
.PHONY: dmeventd clvmd cmirrord
@@ -162,8 +157,8 @@
ifeq ("@BUILD_CMIRRORD@", "yes")
SUBDIRS += cmirrord
endif
-@@ -30,6 +26,10 @@
- SUBDIRS += dmeventd
+@@ -36,6 +32,10 @@
+ SUBDIRS = clvmd cmirrord dmeventd
endif
+ifneq ("@CLVMD@", "none")
Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series Sun Mar 21 01:40:50 2010 (r801)
+++ lvm2/trunk/debian/patches/series Sat May 15 15:23:36 2010 (r802)
@@ -6,6 +6,4 @@
libdm-atomic.patch
rules-subdir.patch
implicit-pointer.patch
-libdm-static.patch
-libdm-event-static.patch
scripts-bash.sh
More information about the pkg-lvm-commits
mailing list