Tags: patch
User: [email protected]
Usertags: origin-ubuntu lucid ubuntu-patch
Hello,
Here is a patch to enable dmeventd and libdevmapper-event.
Thanks,
-Kees
--
Kees Cook @debian.org
diff -Nru lvm2-2.02.54/debian/control lvm2-2.02.54/debian/control
--- lvm2-2.02.54/debian/control 2010-02-11 04:34:46.000000000 -0800
+++ lvm2-2.02.54/debian/control 2010-02-11 04:16:39.000000000 -0800
@@ -48,7 +49,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-event1.02.1 (= ${binary:Version}), libselinux1-dev
Description: The 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
@@ -118,3 +122,31 @@
raid, and other drivers that create "virtual" block devices.
.
This package contains a utility for modifying device mappings.
+
+Package: libdevmapper-event1.02.1
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: The Linux Kernel Device Mapper userspace 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
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: The Linux Kernel Device Mapper userspace 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 a daemon to monitor events of devmapper devices.
diff -Nru lvm2-2.02.54/debian/dmeventd.8 lvm2-2.02.54/debian/dmeventd.8
--- lvm2-2.02.54/debian/dmeventd.8 1969-12-31 16:00:00.000000000 -0800
+++ lvm2-2.02.54/debian/dmeventd.8 2010-02-10 17:04:34.000000000 -0800
@@ -0,0 +1,27 @@
+.TH DMEVENTD 8 "Aug 18 2008"
+.SH NAME
+dmeventd \- Device-mapper event monitoring daemon.
+.SH SYNOPSIS
+.ad l
+.B dmeventd
+.I [-V|-d|-h]
+.ad b
+.SH DESCRIPTION
+dmeventd is the event monitoring daemon for device-mapper devices.
+.SH OPTIONS
+.TP
+.B -V
+Show version of dmeventd
+.TP
+.B -d
+Don't fork, run in the foreground
+.TP
+.B -h
+Display command-line arguments
+.SH AUTHORS
+Original author: Joe Thornber ([email protected])
+.PP
+This manual page was written by Luke Yelavich <[email protected]>, for the Ubuntu project (but may be used by others).
+
+.SH SEE ALSO
+Device-mapper resource page: http://sources.redhat.com/dm/
diff -Nru lvm2-2.02.54/debian/dmeventd.install lvm2-2.02.54/debian/dmeventd.install
--- lvm2-2.02.54/debian/dmeventd.install 1969-12-31 16:00:00.000000000 -0800
+++ lvm2-2.02.54/debian/dmeventd.install 2010-02-11 03:02:09.000000000 -0800
@@ -0,0 +1 @@
+sbin/dmeventd
diff -Nru lvm2-2.02.54/debian/dmeventd.manpages lvm2-2.02.54/debian/dmeventd.manpages
--- lvm2-2.02.54/debian/dmeventd.manpages 1969-12-31 16:00:00.000000000 -0800
+++ lvm2-2.02.54/debian/dmeventd.manpages 2010-02-10 17:05:21.000000000 -0800
@@ -0,0 +1 @@
+debian/dmeventd.8
diff -Nru lvm2-2.02.54/debian/libdevmapper-dev.install lvm2-2.02.54/debian/libdevmapper-dev.install
--- lvm2-2.02.54/debian/libdevmapper-dev.install 2010-02-11 04:34:46.000000000 -0800
+++ lvm2-2.02.54/debian/libdevmapper-dev.install 2010-02-11 02:50:57.000000000 -0800
@@ -1,3 +1,5 @@
usr/include/libdevmapper.h
+usr/include/libdevmapper-event.h
usr/lib/libdevmapper.a
+usr/lib/libdevmapper-event.a
usr/lib/pkgconfig
diff -Nru lvm2-2.02.54/debian/libdevmapper-event1.02.1.install lvm2-2.02.54/debian/libdevmapper-event1.02.1.install
--- lvm2-2.02.54/debian/libdevmapper-event1.02.1.install 1969-12-31 16:00:00.000000000 -0800
+++ lvm2-2.02.54/debian/libdevmapper-event1.02.1.install 2010-02-11 02:47:09.000000000 -0800
@@ -0,0 +1 @@
+lib/libdevmapper-event.so.*
diff -Nru lvm2-2.02.54/debian/libdevmapper-event1.02.1.symbols lvm2-2.02.54/debian/libdevmapper-event1.02.1.symbols
--- lvm2-2.02.54/debian/libdevmapper-event1.02.1.symbols 1969-12-31 16:00:00.000000000 -0800
+++ lvm2-2.02.54/debian/libdevmapper-event1.02.1.symbols 2010-02-10 17:03:44.000000000 -0800
@@ -0,0 +1,20 @@
+libdevmapper-event.so.1.02.1 libdevmapper-event1.02.1 #MINVER#
+ b...@base 2:1.02.20
+ dm_event_get_registered_dev...@base 2:1.02.20
+ dm_event_handler_cre...@base 2:1.02.20
+ dm_event_handler_dest...@base 2:1.02.20
+ dm_event_handler_get_...@base 2:1.02.20
+ dm_event_handler_get_event_m...@base 2:1.02.20
+ dm_event_handler_get_ma...@base 2:1.02.20
+ dm_event_handler_get_mi...@base 2:1.02.20
+ dm_event_handler_get_time...@base 2:1.02.20
+ dm_event_handler_get_u...@base 2:1.02.20
+ dm_event_handler_set_dev_n...@base 2:1.02.20
+ dm_event_handler_set_...@base 2:1.02.20
+ dm_event_handler_set_event_m...@base 2:1.02.20
+ dm_event_handler_set_ma...@base 2:1.02.20
+ dm_event_handler_set_mi...@base 2:1.02.20
+ dm_event_handler_set_time...@base 2:1.02.20
+ dm_event_handler_set_u...@base 2:1.02.20
+ dm_event_register_hand...@base 2:1.02.20
+ dm_event_unregister_hand...@base 2:1.02.20
diff -Nru lvm2-2.02.54/debian/patches/libdm-event-static.patch lvm2-2.02.54/debian/patches/libdm-event-static.patch
--- lvm2-2.02.54/debian/patches/libdm-event-static.patch 1969-12-31 16:00:00.000000000 -0800
+++ lvm2-2.02.54/debian/patches/libdm-event-static.patch 2010-02-11 03:13:54.000000000 -0800
@@ -0,0 +1,29 @@
+Index: merged/daemons/dmeventd/Makefile.in
+===================================================================
+--- merged.orig/daemons/dmeventd/Makefile.in 2010-02-11 03:13:14.297770338 -0800
++++ merged/daemons/dmeventd/Makefile.in 2010-02-11 03:13:52.074691571 -0800
+@@ -26,12 +26,12 @@
+ INSTALL_DMEVENTD_TARGETS = install_dmeventd_dynamic
+ INSTALL_LIB_TARGETS = install_lib_dynamic
+
+-ifeq ("@STATIC_LINK@", "yes")
+ LIB_STATIC = libdevmapper-event.a
++ifeq ("@STATIC_LINK@", "yes")
+ TARGETS += dmeventd.static
+ INSTALL_DMEVENTD_TARGETS += install_dmeventd_static
+- INSTALL_LIB_TARGETS += install_lib_static
+ endif
++ INSTALL_LIB_TARGETS += install_lib_static
+
+ LIB_VERSION = $(LIB_VERSION_DM)
+
+@@ -86,8 +86,7 @@
+ $(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+
+ install_lib_static: libdevmapper-event.a
+- $(INSTALL) -D $< $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
+- $(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
++ $(INSTALL) -D $< $(usrlibdir)/libdevmapper-event.a
+
+ install_lib: $(INSTALL_LIB_TARGETS)
+
diff -Nru lvm2-2.02.54/debian/patches/rules-subdir.patch lvm2-2.02.54/debian/patches/rules-subdir.patch
--- lvm2-2.02.54/debian/patches/rules-subdir.patch 2010-02-11 04:34:46.000000000 -0800
+++ lvm2-2.02.54/debian/patches/rules-subdir.patch 2010-02-11 02:42:21.000000000 -0800
@@ -1,5 +1,7 @@
---- a/make.tmpl.in
-+++ b/make.tmpl.in
+Index: merged/make.tmpl.in
+===================================================================
+--- merged.orig/make.tmpl.in 2010-02-11 02:39:16.724020797 -0800
++++ merged/make.tmpl.in 2010-02-11 02:39:16.794019477 -0800
@@ -128,65 +128,27 @@
.PHONY: all install install_cluster pofile distclean clean cflow device-mapper
@@ -93,14 +95,16 @@
$(RM) -rf $(DISTCLEAN_DIRS)
$(RM) $(DISTCLEAN_TARGETS) \
$(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
---- a/Makefile.in
-+++ b/Makefile.in
+Index: merged/Makefile.in
+===================================================================
+--- merged.orig/Makefile.in 2010-02-11 02:37:57.465269848 -0800
++++ merged/Makefile.in 2010-02-11 02:39:16.794019477 -0800
@@ -27,7 +27,7 @@
SUBDIRS += po
endif
-SUBDIRS += lib tools daemons libdm
-+SUBDIRS += libdm lib tools daemons
++SUBDIRS += libdm lib daemons tools
ifeq ("@APPLIB@", "yes")
SUBDIRS += liblvm
@@ -136,8 +140,10 @@
ifneq ("@CSCOPE_CMD@", "")
cscope.out: tools
@CSCOPE_CMD@ -b -R
---- a/man/Makefile.in
-+++ b/man/Makefile.in
+Index: merged/man/Makefile.in
+===================================================================
+--- merged.orig/man/Makefile.in 2010-02-11 02:39:16.694020715 -0800
++++ merged/man/Makefile.in 2010-02-11 02:39:16.794019477 -0800
@@ -49,9 +49,7 @@
.PHONY: man
@@ -149,3 +155,29 @@
$(MAN5) $(MAN8) $(MAN8CLUSTER): Makefile
+Index: merged/daemons/Makefile.in
+===================================================================
+--- merged.orig/daemons/Makefile.in 2010-02-11 02:37:57.485269638 -0800
++++ merged/daemons/Makefile.in 2010-02-11 02:42:19.164019853 -0800
+@@ -18,9 +18,7 @@
+
+ .PHONY: dmeventd clvmd cmirrord
+
+-ifneq ("@CLVMD@", "none")
+- SUBDIRS = clvmd
+-endif
++SUBDIRS =
+
+ ifeq ("@BUILD_CMIRRORD@", "yes")
+ SUBDIRS += cmirrord
+@@ -30,6 +28,10 @@
+ SUBDIRS += dmeventd
+ endif
+
++ifneq ("@CLVMD@", "none")
++ SUBDIRS += clvmd
++endif
++
+ include ../make.tmpl
+
+ ifeq ("@BUILD_DMEVENTD@", "yes")
diff -Nru lvm2-2.02.54/debian/patches/series lvm2-2.02.54/debian/patches/series
--- lvm2-2.02.54/debian/patches/series 2010-02-11 04:34:46.000000000 -0800
+++ lvm2-2.02.54/debian/patches/series 2010-02-11 02:50:51.000000000 -0800
@@ -7,4 +7,5 @@
rules-subdir.patch
implicit-pointer.patch
libdm-static.patch
+libdm-event-static.patch
scripts-bash.sh
diff -Nru lvm2-2.02.54/debian/rules lvm2-2.02.54/debian/rules
--- lvm2-2.02.54/debian/rules 2010-02-11 04:34:46.000000000 -0800
+++ lvm2-2.02.54/debian/rules 2010-02-11 04:06:53.000000000 -0800
@@ -70,6 +70,8 @@
--with-device-uid=0 \
--with-device-gid=6 \
--with-device-mode=0660 \
+ --enable-dmeventd \
+ --enable-cmdlib \
--enable-pkgconfig \
--enable-readline
touch $@
@@ -135,7 +140,7 @@
$(MAKE) -C $(BUILD_DIR)/build-udeb install_$* DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
touch $@
-install: $(addprefix install-,libdevmapper libdevmapper-udeb dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
+install: $(addprefix install-,libdevmapper libdevmapper-udeb dmeventd dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
install-base:
dh_installdocs
@@ -199,7 +207,7 @@
dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
-install-libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME)
+install-libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME) -plibdevmapper-event$(DEVMAPPER_ABINAME)
install-libdevmapper: DIR = $(BUILD_DIR)/install-deb-device-mapper
install-libdevmapper: $(STAMPS_DIR)/install-deb-device-mapper
dh_testdir
@@ -208,11 +216,15 @@
dh_install --sourcedir=$(DIR)
dh_installchangelogs WHATS_NEW_DM
dh_installexamples
- dh_link -p libdevmapper-dev lib/libdevmapper.so.$(DEVMAPPER_ABINAME) usr/lib/libdevmapper.so
- dh_makeshlibs -p 'libdevmapper$(DEVMAPPER_ABINAME)' \
+ dh_link -p libdevmapper-dev lib/libdevmapper.so.$(DEVMAPPER_ABINAME) lib/libdevmapper.so
+ DH_OPTIONS= dh_makeshlibs -p 'libdevmapper$(DEVMAPPER_ABINAME)' \
--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
"-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
-- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
+ dh_link -p libdevmapper-dev lib/libdevmapper-event.so.$(DEVMAPPER_ABINAME) lib/libdevmapper-event.so
+ DH_OPTIONS= dh_makeshlibs -p 'libdevmapper-event$(DEVMAPPER_ABINAME)' \
+ "-Vlibdevmapper-event$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
+ -- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
install-libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb
@@ -240,6 +252,29 @@
dh_md5sums
dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
+install-libdevmapper-event: export DH_OPTIONS = -plibdevmapper-event$(DEVMAPPER_ABINAME)
+install-libdevmapper-event: DIR = $(BUILD_DIR)/install-deb-device-mapper
+install-libdevmapper-event: $(STAMPS_DIR)/install-deb-device-mapper
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_install --sourcedir=$(DIR)
+ dh_installchangelogs WHATS_NEW_DM
+ dh_installexamples
+ $(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+
+install-dmeventd: export DH_OPTIONS = -pdmeventd
+install-dmeventd: DIR = $(BUILD_DIR)/install-deb-device-mapper
+install-dmeventd: $(STAMPS_DIR)/install-deb-device-mapper
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_install --sourcedir=$(DIR)
+ dh_installchangelogs WHATS_NEW_DM
+ dh_installdebconf
+ dh_installexamples
+ $(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+
install-lvm2: export DH_OPTIONS = -plvm2
install-lvm2: DIR = $(BUILD_DIR)/install-deb-lvm2
install-lvm2: $(STAMPS_DIR)/install-deb-lvm2
