r913 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Sun May 27 14:25:22 UTC 2012
Author: waldi
Date: Sun May 27 14:25:21 2012
New Revision: 913
Log:
* debian/changelog: Update.
* debian/dmeventd.install: Install dmeventd plugins.
* debian/lvm2.install: Don't install plugins.
* debian/patches/dirs.patch: Correctly specify directory.
* debian/rules: Fix installation.
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/dmeventd.install
lvm2/trunk/debian/lvm2.install
lvm2/trunk/debian/patches/dirs.patch
lvm2/trunk/debian/rules
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Sun May 27 13:53:11 2012 (r912)
+++ lvm2/trunk/debian/changelog Sun May 27 14:25:21 2012 (r913)
@@ -3,7 +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.
+ - Force dmeventd to look into correct directory for shared libs.
-- Bastian Blank <waldi at debian.org> Sun, 27 May 2012 13:51:57 +0200
Modified: lvm2/trunk/debian/dmeventd.install
==============================================================================
--- lvm2/trunk/debian/dmeventd.install Sun May 27 13:53:11 2012 (r912)
+++ lvm2/trunk/debian/dmeventd.install Sun May 27 14:25:21 2012 (r913)
@@ -1,2 +1,3 @@
+lib/*/device-mapper
sbin/dmeventd
usr/share/man/man8/dmeventd.8
Modified: lvm2/trunk/debian/lvm2.install
==============================================================================
--- lvm2/trunk/debian/lvm2.install Sun May 27 13:53:11 2012 (r912)
+++ lvm2/trunk/debian/lvm2.install Sun May 27 14:25:21 2012 (r913)
@@ -1,6 +1,5 @@
../../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 13:53:11 2012 (r912)
+++ lvm2/trunk/debian/patches/dirs.patch Sun May 27 14:25:21 2012 (r913)
@@ -54,7 +54,7 @@
- if (!(dl = dlopen(data->dso_name, RTLD_NOW))) {
+ if (strchr(data->dso_name, '/') == NULL) {
-+ strcpy(dso_name, "/lib/device-mapper/");
++ strcpy(dso_name, PLUGIN_PATH);
+ strncat(dso_name, data->dso_name, sizeof(dso_name));
+ } else {
+ strncpy(dso_name, data->dso_name, sizeof(dso_name));
@@ -65,3 +65,13 @@
const char *dlerr = dlerror();
syslog(LOG_ERR, "dmeventd %s dlopen failed: %s", data->dso_name,
dlerr);
+--- a/daemons/dmeventd/Makefile.in
++++ b/daemons/dmeventd/Makefile.in
+@@ -58,6 +58,7 @@
+
+ LIBS += -ldevmapper
+ LVMLIBS += -ldevmapper-event $(PTHREAD_LIBS)
++CFLAGS += -DPLUGIN_PATH=\"$(libdir)/device-mapper/\"
+
+ dmeventd: $(LIB_SHARED) dmeventd.o
+ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -L. -o $@ dmeventd.o \
Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules Sun May 27 13:53:11 2012 (r912)
+++ lvm2/trunk/debian/rules Sun May 27 14:25:21 2012 (r913)
@@ -169,7 +169,7 @@
install_dmeventd: export DH_OPTIONS = -pdmeventd
install_dmeventd: DIR = $(BUILD_DIR)/install_deb
-install_dmeventd: $(STAMPS_DIR)/install_deb
+install_dmeventd: $(STAMPS_DIR)/install_deb install_liblvm2
+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
@@ -233,7 +233,7 @@
install_lvm2: export DH_OPTIONS = -plvm2
install_lvm2: DIR = $(BUILD_DIR)/install_deb
-install_lvm2: $(STAMPS_DIR)/install_deb install_liblvm2
+install_lvm2: $(STAMPS_DIR)/install_deb
+$(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