Since device-mapper tries to build with selinux by default, we've removed it, then...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@472 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 2ab5d089fc94511c48b86f8ff9cd84c4fe3b4cf0..dc025f791bc9504551ff72f65181e5ff748fe2e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
+  Since device-mapper tries to build with selinux by default, we've removed
+  it, then commented out the selinux support. The ebuild will need to
+  enable/disable selinux support based on the selinux USE flag. This should
+  resolve bug #157538.
+
   13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.scripts:
   More fixes for similarly-named modules.

diff --git a/gen_compile.sh b/gen_compile.sh
index 8be3556779c7fa3b9abb690ad7d13b872edf0370..c8abc5ea14cf629f2737fcd750d28e384bd15cc9 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -513,9 +513,10 @@ compile_dmraid() {
                        ./configure --enable-static_link --prefix=${TEMP}/dmraid >> ${DEBUGFILE} 2>&1 ||
                                gen_die 'Configure of dmraid failed!'
                                
-                       #We dont necessarily have selinux installed yet .. look into selinux global support in the future.
-                       # sed -i tools/Makefile -e "s|DMRAIDLIBS += -lselinux||g"
-                       echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
+                       # We dont necessarily have selinux installed yet... look into
+                       # selinux global support in the future.
+                       sed -i tools/Makefile -e "s|DMRAIDLIBS += -lselinux||g"
+                       ###echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
                mkdir -p "${TEMP}/dmraid"
                print_info 1 'dmraid: >> Compiling...'
                        compile_generic '' utils
@@ -738,8 +739,10 @@ compile_device_mapper() {
                [ ! -d "${DEVICE_MAPPER_DIR}" ] &&
                        gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
                cd "${DEVICE_MAPPER_DIR}"
-               ./configure  --prefix=${TEMP}/device-mapper --enable-static_link >> ${DEBUGFILE} 2>&1 ||
-                       gen_die 'Configuring device-mapper failed!'
+               mymapperconf="--enable-static_link"
+               ###mymapperconf="--disable-selinux ${mymapperconf}"
+               ./configure  --prefix=${TEMP}/device-mapper ${mymapperconf} \
+                       >> ${DEBUGFILE} 2>&1 || gen_die 'Configuring device-mapper failed!'
                print_info 1 'device-mapper: >> Compiling...'
                compile_generic '' utils
                compile_generic 'install' utils