r912 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Sun May 27 13:53:11 UTC 2012


Author: waldi
Date: Sun May 27 13:53:11 2012
New Revision: 912

Log:
* debian/changelog: Update.
* debian/control: Document missing multi-arch for dmeventd.
* debian/lvm2.install: Install dmeventd plugins.
* debian/patches/dirs.patch: Force library path in dmeventd.
* debian/patches/install.patch: Revert installation change.
* debian/rules: Force correct order of installations.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/lvm2.install
   lvm2/trunk/debian/patches/dirs.patch
   lvm2/trunk/debian/patches/install.patch
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sun May 27 12:49:34 2012	(r911)
+++ lvm2/trunk/debian/changelog	Sun May 27 13:53:11 2012	(r912)
@@ -3,6 +3,7 @@
   * Force building with -j1.
   * Add dmeventd and libdevmapper-event packages. (closes: #514706)
     - Disable monitoring by default.
+    - Force dmeventd to look into correct directory.
 
  -- Bastian Blank <waldi at debian.org>  Sun, 27 May 2012 13:51:57 +0200
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Sun May 27 12:49:34 2012	(r911)
+++ lvm2/trunk/debian/control	Sun May 27 13:53:11 2012	(r912)
@@ -142,6 +142,7 @@
 Package: dmeventd
 Architecture: any
 Depends: ${shlibs:Depends}
+# No Multi-Arch: foreign, plugins depend on the current architecture
 Description: Linux Kernel Device Mapper event daemon
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
  Team's implementation of a minimalistic kernel-space driver that handles

Modified: lvm2/trunk/debian/lvm2.install
==============================================================================
--- lvm2/trunk/debian/lvm2.install	Sun May 27 12:49:34 2012	(r911)
+++ lvm2/trunk/debian/lvm2.install	Sun May 27 13:53:11 2012	(r912)
@@ -1,5 +1,6 @@
 ../../tree/lvm2/* /
 etc/lvm/lvm.conf
+lib/*/device-mapper lib
 sbin/fsadm
 sbin/lv*
 sbin/pv*

Modified: lvm2/trunk/debian/patches/dirs.patch
==============================================================================
--- lvm2/trunk/debian/patches/dirs.patch	Sun May 27 12:49:34 2012	(r911)
+++ lvm2/trunk/debian/patches/dirs.patch	Sun May 27 13:53:11 2012	(r912)
@@ -1,6 +1,6 @@
 --- a/doc/example.conf.in
 +++ b/doc/example.conf.in
-@@ -84,7 +84,7 @@
+@@ -86,7 +86,7 @@
      # It is safe to delete the contents: the tools regenerate it.
      # (The old setting 'cache' is still respected if neither of
      # these new ones is present.)
@@ -9,7 +9,7 @@
      cache_file_prefix = ""
  
      # You can turn off writing this cache file by setting this to 0.
-@@ -393,7 +393,7 @@
+@@ -405,7 +405,7 @@
      # Full pathnames can be given.
  
      # Search this directory first for shared libraries.
@@ -20,7 +20,7 @@
      #   locking_library = "liblvm2clusterlock.so"
 --- a/lib/commands/toolcontext.c
 +++ b/lib/commands/toolcontext.c
-@@ -782,10 +782,8 @@
+@@ -827,10 +827,8 @@
  
  	if (cache_dir || cache_file_prefix) {
  		if (dm_snprintf(cache_file, sizeof(cache_file),
@@ -33,7 +33,7 @@
  		    cache_file_prefix ? : DEFAULT_CACHE_FILE_PREFIX) < 0) {
  			log_error("Persistent cache filename too long.");
  			f3->destroy(f3);
-@@ -793,8 +791,8 @@
+@@ -838,8 +836,8 @@
  		}
  	} else if (!(dev_cache = find_config_tree_str(cmd, "devices/cache", NULL)) &&
  		   (dm_snprintf(cache_file, sizeof(cache_file),
@@ -44,3 +44,24 @@
  				DEFAULT_CACHE_FILE_PREFIX) < 0)) {
  		log_error("Persistent cache filename too long.");
  		f3->destroy(f3);
+--- a/daemons/dmeventd/dmeventd.c
++++ b/daemons/dmeventd/dmeventd.c
+@@ -912,8 +912,17 @@
+ {
+ 	void *dl;
+ 	struct dso_data *ret = NULL;
++	char dso_name[PATH_MAX];
+ 
+-	if (!(dl = dlopen(data->dso_name, RTLD_NOW))) {
++	if (strchr(data->dso_name, '/') == NULL) {
++		strcpy(dso_name, "/lib/device-mapper/");
++		strncat(dso_name, data->dso_name, sizeof(dso_name));
++	} else {
++		strncpy(dso_name, data->dso_name, sizeof(dso_name));
++	}
++	dso_name[sizeof(dso_name) - 1] = 0;
++
++	if (!(dl = dlopen(dso_name, RTLD_NOW))) {
+ 		const char *dlerr = dlerror();
+ 		syslog(LOG_ERR, "dmeventd %s dlopen failed: %s", data->dso_name,
+ 		       dlerr);

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Sun May 27 12:49:34 2012	(r911)
+++ lvm2/trunk/debian/patches/install.patch	Sun May 27 13:53:11 2012	(r912)
@@ -45,3 +45,74 @@
  
  .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
  
+@@ -344,17 +336,14 @@
+ 	$(INSTALL_DIR) $(usrlibdir)
+ 	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
+ 
+-# FIXME: plugins are installed to subdirs 
+-#        and for compatibility links in libdir are created
+-#        when the code is fixed links could be removed.
++install_dm_lib: $(LIB_SHARED)
++	$(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F).$(LIB_VERSION)
++
+ install_dm_plugin: $(LIB_SHARED)
+ 	$(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
+-	$(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
+ 
+ install_lvm2_plugin: $(LIB_SHARED)
+ 	$(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
+-	$(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
+-	$(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
+ endif
+ 
+ $(LIB_STATIC): $(OBJECTS)
+--- a/daemons/dmeventd/plugins/mirror/Makefile.in
++++ b/daemons/dmeventd/plugins/mirror/Makefile.in
+@@ -30,6 +30,7 @@
+ 
+ include $(top_builddir)/make.tmpl
+ 
++CLDFLAGS += -Wl,-rpath,'$$ORIGIN'
+ LIBS += -ldevmapper-event-lvm2 -ldevmapper $(DAEMON_LIBS)
+ 
+ install_lvm2: install_dm_plugin
+--- a/daemons/dmeventd/plugins/raid/Makefile.in
++++ b/daemons/dmeventd/plugins/raid/Makefile.in
+@@ -29,6 +29,7 @@
+ 
+ include $(top_builddir)/make.tmpl
+ 
++CLDFLAGS += -Wl,-rpath,'$$ORIGIN'
+ LIBS += -ldevmapper-event-lvm2 -ldevmapper
+ 
+ install_lvm2: install_dm_plugin
+--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
++++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
+@@ -26,6 +26,7 @@
+ 
+ include $(top_builddir)/make.tmpl
+ 
++CLDFLAGS += -Wl,-rpath,'$$ORIGIN'
+ LIBS += -ldevmapper-event-lvm2 -ldevmapper $(DAEMON_LIBS)
+ 
+ install_lvm2: install_dm_plugin
+--- a/daemons/dmeventd/plugins/thin/Makefile.in
++++ b/daemons/dmeventd/plugins/thin/Makefile.in
+@@ -29,6 +29,7 @@
+ 
+ include $(top_builddir)/make.tmpl
+ 
++CLDFLAGS += -Wl,-rpath,'$$ORIGIN'
+ LIBS += -ldevmapper-event-lvm2 -ldevmapper
+ 
+ install_lvm2: install_dm_plugin
+--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
++++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
+@@ -26,6 +26,6 @@
+ 
+ LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS) $(DAEMON_LIBS)
+ 
+-install_lvm2: install_lib_shared
++install_lvm2: install_dm_lib
+ 
+ install: install_lvm2

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Sun May 27 12:49:34 2012	(r911)
+++ lvm2/trunk/debian/rules	Sun May 27 13:53:11 2012	(r912)
@@ -233,7 +233,7 @@
 
 install_lvm2: export DH_OPTIONS = -plvm2
 install_lvm2: DIR = $(BUILD_DIR)/install_deb
-install_lvm2: $(STAMPS_DIR)/install_deb
+install_lvm2: $(STAMPS_DIR)/install_deb install_liblvm2
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_installinit --no-start -- start 26 S .
 	+$(MAKE_SELF) install-base



More information about the pkg-lvm-commits mailing list