r909 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Sun May 27 12:17:26 UTC 2012


Author: waldi
Date: Sun May 27 12:17:24 2012
New Revision: 909

Log:
Add dmeventd and libdevmapper-event packages.

* debian: Update ignores.
* debian/changelog: Update.
* debian/control: Add new packages.
* debian/dmeventd.install, debian/libdevmapper-event1.02.1.install,
  debian/libdevmapper-event1.02.1.symbols: Add
* debian/libdevmapper-dev.install: Add libdevmapper-event.
* debian/patches/dm-event-api.patch: Fix API of libdevmapper-event.
* debian/patches/series: Add patch.
* debian/rules: Install new packages.

Added:
   lvm2/trunk/debian/dmeventd.install
   lvm2/trunk/debian/libdevmapper-event1.02.1.install
   lvm2/trunk/debian/libdevmapper-event1.02.1.symbols
   lvm2/trunk/debian/patches/dm-event-api.patch
Modified:
   lvm2/trunk/debian/   (props changed)
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/libdevmapper-dev.install
   lvm2/trunk/debian/patches/series
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sun May 27 11:52:38 2012	(r908)
+++ lvm2/trunk/debian/changelog	Sun May 27 12:17:24 2012	(r909)
@@ -1,6 +1,7 @@
 lvm2 (2.02.95-4) UNRELEASED; urgency=low
 
   * Force building with -j1.
+  * Add dmeventd and libdevmapper-event packages. (closes: #514706)
 
  -- 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 11:52:38 2012	(r908)
+++ lvm2/trunk/debian/control	Sun May 27 12:17:24 2012	(r909)
@@ -50,7 +50,7 @@
 Package: libdevmapper-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libdevmapper1.02.1 (= ${binary:Version}), libselinux1-dev
+Depends: ${misc:Depends}, libdevmapper1.02.1 (= ${binary:Version}), libdevmapper-events1.02.1 (= ${binary:Version}), libselinux1-dev
 Description: Linux Kernel Device Mapper header files
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
  Team's implementation of a minimalistic kernel-space driver that handles
@@ -124,6 +124,33 @@
  .
  This package contains a utility for modifying device mappings.
 
+Package: libdevmapper-event1.02.1
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}
+Description: Linux Kernel Device Mapper event support library
+ The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
+ Team's implementation of a minimalistic kernel-space driver that handles
+ volume management, while keeping knowledge of the underlying device layout
+ in user-space.  This makes it useful for not only LVM, but EVMS, software
+ raid, and other drivers that create "virtual" block devices.
+ .
+ This package contains the userspace library to help with event monitoring
+ for devmapper devices, in conjunction with the dmevent daemon.
+
+Package: dmeventd
+Architecture: any
+Depends: ${shlibs:Depends}
+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
+ volume management, while keeping knowledge of the underlying device layout
+ in user-space.  This makes it useful for not only LVM, but EVMS, software
+ raid, and other drivers that create "virtual" block devices.
+ .
+ This package contains a daemon to monitor events of devmapper devices.
+
 Package: liblvm2app2.2
 Section: libs
 Architecture: any

Added: lvm2/trunk/debian/dmeventd.install
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/dmeventd.install	Sun May 27 12:17:24 2012	(r909)
@@ -0,0 +1,2 @@
+sbin/dmeventd
+usr/share/man/man8/dmeventd.8

Modified: lvm2/trunk/debian/libdevmapper-dev.install
==============================================================================
--- lvm2/trunk/debian/libdevmapper-dev.install	Sun May 27 11:52:38 2012	(r908)
+++ lvm2/trunk/debian/libdevmapper-dev.install	Sun May 27 12:17:24 2012	(r909)
@@ -1,3 +1,3 @@
-usr/include/libdevmapper.h
-usr/lib/libdevmapper.so
-usr/lib/pkgconfig/devmapper.pc
+usr/include/libdevmapper*
+usr/lib/libdevmapper*.so
+usr/lib/pkgconfig

Added: lvm2/trunk/debian/libdevmapper-event1.02.1.install
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/libdevmapper-event1.02.1.install	Sun May 27 12:17:24 2012	(r909)
@@ -0,0 +1 @@
+lib/*/libdevmapper-event.so.*

Added: lvm2/trunk/debian/libdevmapper-event1.02.1.symbols
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/libdevmapper-event1.02.1.symbols	Sun May 27 12:17:24 2012	(r909)
@@ -0,0 +1,26 @@
+libdevmapper-event.so.1.02.1 libdevmapper-event1.02.1 #MINVER#
+ Base at Base 2:1.02.20
+ dm_event_daemon_fini_fifos at Base 2:1.02.74
+ dm_event_daemon_init_fifos at Base 2:1.02.74
+ dm_event_daemon_talk at Base 2:1.02.74
+ dm_event_get_registered_device at Base 2:1.02.20
+ dm_event_get_version at Base 2:1.02.74
+ dm_event_handler_create at Base 2:1.02.20
+ dm_event_handler_destroy at Base 2:1.02.20
+ dm_event_handler_get_dev_name at Base 2:1.02.74
+ dm_event_handler_get_dso at Base 2:1.02.20
+ dm_event_handler_get_event_mask at Base 2:1.02.20
+ dm_event_handler_get_major at Base 2:1.02.20
+ dm_event_handler_get_minor at Base 2:1.02.20
+ dm_event_handler_get_timeout at Base 2:1.02.20
+ dm_event_handler_get_uuid at Base 2:1.02.20
+ dm_event_handler_set_dev_name at Base 2:1.02.20
+ dm_event_handler_set_dmeventd_path at Base 2:1.02.74
+ dm_event_handler_set_dso at Base 2:1.02.20
+ dm_event_handler_set_event_mask at Base 2:1.02.20
+ dm_event_handler_set_major at Base 2:1.02.20
+ dm_event_handler_set_minor at Base 2:1.02.20
+ dm_event_handler_set_timeout at Base 2:1.02.20
+ dm_event_handler_set_uuid at Base 2:1.02.20
+ dm_event_register_handler at Base 2:1.02.20
+ dm_event_unregister_handler at Base 2:1.02.20

Added: lvm2/trunk/debian/patches/dm-event-api.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/patches/dm-event-api.patch	Sun May 27 12:17:24 2012	(r909)
@@ -0,0 +1,115 @@
+--- a/daemons/dmeventd/libdevmapper-event.c
++++ b/daemons/dmeventd/libdevmapper-event.c
+@@ -344,7 +344,7 @@
+ 	return bytes == size;
+ }
+ 
+-int daemon_talk(struct dm_event_fifos *fifos,
++int dm_event_daemon_talk(struct dm_event_fifos *fifos,
+ 		struct dm_event_daemon_message *msg, int cmd,
+ 		const char *dso_name, const char *dev_name,
+ 		enum dm_event_mask evmask, uint32_t timeout)
+@@ -467,7 +467,7 @@
+ 	return ret;
+ }
+ 
+-int init_fifos(struct dm_event_fifos *fifos)
++int dm_event_daemon_init_fifos(struct dm_event_fifos *fifos)
+ {
+ 	/* FIXME? Is fifo the most suitable method? Why not share
+ 	   comms/daemon code with something else e.g. multipath? */
+@@ -514,10 +514,10 @@
+ 	if (!_start_daemon(dmeventd_path, fifos))
+ 		return_0;
+ 
+-	return init_fifos(fifos);
++	return dm_event_daemon_init_fifos(fifos);
+ }
+ 
+-void fini_fifos(struct dm_event_fifos *fifos)
++void dm_event_daemon_fini_fifos(struct dm_event_fifos *fifos)
+ {
+ 	if (flock(fifos->server, LOCK_UN))
+ 		log_error("flock unlock %s", fifos->server_path);
+@@ -596,16 +596,16 @@
+ 		return -ESRCH;
+ 	}
+ 
+-	ret = daemon_talk(&fifos, msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0);
++	ret = dm_event_daemon_talk(&fifos, msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0);
+ 
+ 	dm_free(msg->data);
+ 	msg->data = 0;
+ 
+ 	if (!ret)
+-		ret = daemon_talk(&fifos, msg, cmd, dso_name, dev_name, evmask, timeout);
++		ret = dm_event_daemon_talk(&fifos, msg, cmd, dso_name, dev_name, evmask, timeout);
+ 
+ 	/* what is the opposite of init? */
+-	fini_fifos(&fifos);
++	dm_event_daemon_fini_fifos(&fifos);
+ 
+ 	return ret;
+ }
+@@ -814,7 +814,7 @@
+ 	char *p;
+ 	struct dm_event_daemon_message msg = { 0, 0, NULL };
+ 
+-	if (daemon_talk(fifos, &msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0))
++	if (dm_event_daemon_talk(fifos, &msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0))
+ 		return 0;
+ 	p = msg.data;
+ 	*version = 0;
+--- a/daemons/dmeventd/.exported_symbols
++++ b/daemons/dmeventd/.exported_symbols
+@@ -1,4 +1,4 @@
+-init_fifos
+-fini_fifos
+-daemon_talk
++dm_event_daemon_init_fifos
++dm_event_daemon_fini_fifos
++dm_event_daemon_talk
+ dm_event_get_version
+--- a/daemons/dmeventd/dmeventd.c
++++ b/daemons/dmeventd/dmeventd.c
+@@ -1827,14 +1827,14 @@
+ 
+ 	/* Get the list of registrations from the running daemon. */
+ 
+-	if (!init_fifos(&fifos)) {
++	if (!dm_event_daemon_init_fifos(&fifos)) {
+ 		fprintf(stderr, "WARNING: Could not initiate communication with existing dmeventd.\n");
+ 		return;
+ 	}
+ 
+ 	if (!dm_event_get_version(&fifos, &version)) {
+ 		fprintf(stderr, "WARNING: Could not communicate with existing dmeventd.\n");
+-		fini_fifos(&fifos);
++		dm_event_daemon_fini_fifos(&fifos);
+ 		return;
+ 	}
+ 
+@@ -1845,7 +1845,7 @@
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_GET_STATUS, "-", "-", 0, 0)) {
++	if (dm_event_daemon_talk(&fifos, &msg, DM_EVENT_CMD_GET_STATUS, "-", "-", 0, 0)) {
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+@@ -1874,12 +1874,12 @@
+ 	}
+ 	_initial_registrations[count] = 0;
+ 
+-	if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_DIE, "-", "-", 0, 0)) {
++	if (dm_event_daemon_talk(&fifos, &msg, DM_EVENT_CMD_DIE, "-", "-", 0, 0)) {
+ 		fprintf(stderr, "Old dmeventd refused to die.\n");
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	fini_fifos(&fifos);
++	dm_event_daemon_fini_fifos(&fifos);
+ }
+ 
+ static void usage(char *prog, FILE *file)

Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series	Sun May 27 11:52:38 2012	(r908)
+++ lvm2/trunk/debian/patches/series	Sun May 27 12:17:24 2012	(r909)
@@ -4,3 +4,4 @@
 force-modprobe.patch
 #libdm-atomic.patch
 implicit-pointer.patch
+dm-event-api.patch

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Sun May 27 11:52:38 2012	(r908)
+++ lvm2/trunk/debian/rules	Sun May 27 12:17:24 2012	(r909)
@@ -85,6 +85,7 @@
 		--with-default-locking-dir=/run/lock/lvm \
 		--enable-applib \
 		--enable-cmdlib \
+		--enable-dmeventd \
 		--enable-pkgconfig \
 		--enable-readline \
 		--enable-udev_sync
@@ -166,6 +167,12 @@
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
 	+$(MAKE_SELF) install-base
 
+install_dmeventd: export DH_OPTIONS = -pdmeventd
+install_dmeventd: DIR = $(BUILD_DIR)/install_deb
+install_dmeventd: $(STAMPS_DIR)/install_deb
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+
 install_dmsetup: export DH_OPTIONS = -pdmsetup
 install_dmsetup: DIR = $(BUILD_DIR)/install_deb
 install_dmsetup: $(STAMPS_DIR)/install_deb
@@ -192,6 +199,15 @@
 		-- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
 	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
+install_libdevmapper-event: export DH_OPTIONS = -plibdevmapper-event$(DEVMAPPER_ABINAME)
+install_libdevmapper-event: DIR = $(BUILD_DIR)/install_deb
+install_libdevmapper-event: $(STAMPS_DIR)/install_deb
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+	dh_makeshlibs \
+		"-Vlibdevmapper-event$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
+		-- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
+	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+
 install_libdevmapper-dev: export DH_OPTIONS = -plibdevmapper-dev
 install_libdevmapper-dev: DIR = $(BUILD_DIR)/install_deb
 install_libdevmapper-dev: $(STAMPS_DIR)/install_deb
@@ -229,7 +245,7 @@
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb liblvm2 lvm2 lvm2-udeb clvm)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm)
 
 binary: binary-indep binary-arch
 



More information about the pkg-lvm-commits mailing list