r688 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Mon Aug 17 11:28:58 2009
New Revision: 688

Log:
* debian/patches/libs-cleanup.patch: Always create a static libdevmapper.
* debian/patches/libdm-abi.patch: Also make lvm specific ABI cleanup.

Modified:
   lvm2/trunk/debian/patches/libdm-abi.patch
   lvm2/trunk/debian/patches/libs-cleanup.patch

Modified: lvm2/trunk/debian/patches/libdm-abi.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-abi.patch	Mon Aug 17 10:59:54 2009	(r687)
+++ lvm2/trunk/debian/patches/libdm-abi.patch	Mon Aug 17 11:28:58 2009	(r688)
@@ -33,3 +33,16 @@
  
  	return 1;
  }
+--- a/lib/activate/fs.c
++++ b/lib/activate/fs.c
+@@ -196,10 +196,8 @@
+ 		return 0;
+ 	}
+ 
+-#ifdef HAVE_SELINUX
+ 	if (!dm_set_selinux_context(lv_path, S_IFLNK))
+ 		return_0;
+-#endif
+ 
+ 	return 1;
+ }

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Mon Aug 17 10:59:54 2009	(r687)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Mon Aug 17 11:28:58 2009	(r688)
@@ -98,19 +98,6 @@
  AC_SUBST(interface)
  AC_SUBST(kerneldir)
  AC_SUBST(missingkernel)
---- a/lib/activate/fs.c
-+++ b/lib/activate/fs.c
-@@ -196,10 +196,8 @@
- 		return 0;
- 	}
- 
--#ifdef HAVE_SELINUX
- 	if (!dm_set_selinux_context(lv_path, S_IFLNK))
- 		return_0;
--#endif
- 
- 	return 1;
- }
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
 @@ -99,6 +99,9 @@
@@ -153,7 +140,17 @@
  	install_pkgconfig install_dmeventd
 --- a/libdm/Makefile.in
 +++ b/libdm/Makefile.in
-@@ -46,6 +46,8 @@
+@@ -34,9 +34,7 @@
+ 
+ INCLUDES = -I$(interface) -I.
+ 
+-ifeq ("@STATIC_LINK@", "yes")
+ LIB_STATIC = $(interface)/libdevmapper.a
+-endif
+ 
+ ifeq ("@LIB_SUFFIX@","dylib")
+   LIB_SHARED = $(interface)/libdevmapper.dylib
+@@ -46,6 +44,8 @@
  VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
  LIB_VERSION = $(LIB_VERSION_DM)