r532 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Tue Jan 8 17:39:05 UTC 2008
Author: waldi
Date: Tue Jan 8 17:39:05 2008
New Revision: 532
Log:
* debian/control
- Add automake to build-deps.
- Remove libselinux from build-deps.
* debian/patches/series: Add libs-cleanup.patch.
* debian/patches/libs-cleanup.patch: Add.
* debian/rules: Use autoreconf.
Added:
lvm2/trunk/debian/patches/libs-cleanup.patch
Modified:
lvm2/trunk/debian/control
lvm2/trunk/debian/patches/series
lvm2/trunk/debian/rules
Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control (original)
+++ lvm2/trunk/debian/control Tue Jan 8 17:39:05 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>> 4.2), autotools-dev, libdevmapper-dev (>> 2:1.02.24), libreadline5-dev, libselinux1-dev, quilt
+Build-Depends: debhelper (>> 4.2), automake, libdevmapper-dev (>> 2:1.02.24), libreadline5-dev, quilt
Standards-Version: 3.6.2
Package: lvm2
Added: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- (empty file)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Tue Jan 8 17:39:05 2008
@@ -0,0 +1,118 @@
+--- trunk.orig/configure.in
++++ trunk/configure.in
+@@ -42,7 +42,6 @@
+ LIB_SUFFIX="so"
+ DEVMAPPER=yes
+ ODIRECT=yes
+- SELINUX=yes
+ REALTIME=yes
+ CLUSTER=internal
+ FSADM=no ;;
+@@ -57,7 +56,6 @@
+ LIB_SUFFIX="dylib"
+ DEVMAPPER=yes
+ ODIRECT=no
+- SELINUX=no
+ REALTIME=no
+ CLUSTER=none
+ FSADM=no ;;
+@@ -279,13 +277,6 @@
+ fi
+
+ ################################################################################
+-dnl -- Disable selinux
+-AC_MSG_CHECKING(whether to enable selinux support)
+-AC_ARG_ENABLE(selinux, [ --disable-selinux Disable selinux support],
+-SELINUX=$enableval)
+-AC_MSG_RESULT($SELINUX)
+-
+-################################################################################
+ dnl -- Disable realtime clock support
+ AC_MSG_CHECKING(whether to enable realtime support)
+ AC_ARG_ENABLE(realtime, [ --disable-realtime Disable realtime clock support],
+@@ -437,37 +428,6 @@
+ fi
+
+ ################################################################################
+-dnl -- Check for selinux
+-if test x$SELINUX = xyes; then
+- AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no)
+-
+- if test x$HAVE_SEPOL = xyes; then
+- LIBS="-lsepol $LIBS"
+- fi
+-
+- AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
+-
+- if test x$HAVE_SELINUX = xyes; then
+- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+- LIBS="-lselinux $LIBS"
+- else
+- AC_MSG_WARN(Disabling selinux)
+- fi
+-
+- # With --enable-static_link and selinux enabled, linking lvm.static
+- # fails on at least Debian unstable due to unsatisfied references
+- # to pthread_mutex_lock and _unlock. See if we need -lpthread.
+- if test "$STATIC_LINK-$HAVE_SELINUX" = yes-yes; then
+- lvm_saved_libs=$LIBS
+- LIBS="$LIBS -static"
+- AC_SEARCH_LIBS([pthread_mutex_lock], [pthread],
+- [test "$ac_cv_search_pthread_mutex_lock" = "none required" ||
+- LIB_PTHREAD=-lpthread])
+- LIBS=$lvm_saved_libs
+- fi
+-fi
+-
+-################################################################################
+ dnl -- Check for realtime clock support
+ if test x$REALTIME = xyes; then
+ AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no)
+@@ -578,10 +538,6 @@
+
+ AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
+
+-if test x$HAVE_SELINUX = xyes; then
+- AC_CHECK_HEADERS(selinux/selinux.h,,AC_MSG_ERROR(bailing out))
+-fi
+-
+ ################################################################################
+ AC_PATH_PROG(MODPROBE_CMD, modprobe)
+
+@@ -613,13 +569,11 @@
+ AC_SUBST(LDDEPS)
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LIB_SUFFIX)
+-AC_SUBST(LIBS)
+ AC_SUBST(LVM_VERSION)
+ AC_SUBST(LVM1_FALLBACK)
+ AC_SUBST(DEBUG)
+ AC_SUBST(DEVMAPPER)
+ AC_SUBST(HAVE_LIBDL)
+-AC_SUBST(HAVE_SELINUX)
+ AC_SUBST(HAVE_REALTIME)
+ AC_SUBST(CMDLIB)
+ AC_SUBST(MSGFMT)
+@@ -635,7 +589,6 @@
+ AC_SUBST(DMEVENTD)
+ AC_SUBST(CFLOW_CMD)
+ AC_SUBST(CSCOPE_CMD)
+-AC_SUBST([LIB_PTHREAD])
+
+ ################################################################################
+ dnl -- First and last lines should not contain files to generate in order to
+--- trunk.orig/lib/activate/fs.c
++++ trunk/lib/activate/fs.c
+@@ -174,12 +174,10 @@
+ return 0;
+ }
+
+-#ifdef HAVE_SELINUX
+ if (!dm_set_selinux_context(lv_path, S_IFLNK)) {
+ stack;
+ return 0;
+ }
+-#endif
+
+ return 1;
+ }
Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series (original)
+++ lvm2/trunk/debian/patches/series Tue Jan 8 17:39:05 2008
@@ -1 +1,2 @@
install.patch
+libs-cleanup.patch
Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules (original)
+++ lvm2/trunk/debian/rules Tue Jan 8 17:39:05 2008
@@ -50,6 +50,7 @@
cp -al $(filter-out debian, $(wildcard *)) $(DIR)
cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
+ cd $(DIR); autoreconf
cd $(DIR); \
./configure CFLAGS="$(CFLAGS)" \
$(CONFIGURE_FLAGS) \
@@ -64,13 +65,13 @@
cp -al $(filter-out debian, $(wildcard *)) $(DIR)
cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
+ cd $(DIR); autoreconf
cd $(DIR); \
./configure CFLAGS="$(CFLAGS)" \
$(CONFIGURE_FLAGS) \
--with-optimisation="-Os" \
--with-cluster=none \
- --with-pool=none \
- --disable-selinux
+ --with-pool=none
touch $@
build: $(STAMPS_DIR)/build
More information about the pkg-lvm-commits
mailing list