Adjust selinux stuff in gen_compile.sh to actually do what we intended, not the opposite.

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

diff --git a/ChangeLog b/ChangeLog
index dc025f791bc9504551ff72f65181e5ff748fe2e0..4e50f5c7258ff0b0258fff05b06b4880168ee21c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
+  Adjust selinux stuff in gen_compile.sh to actually do what we intended, not
+  the opposite.
+
   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

diff --git a/gen_compile.sh b/gen_compile.sh
index c8abc5ea14cf629f2737fcd750d28e384bd15cc9..702ba2d9a0889785510faaa74d4fe4bf20267df6 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -739,10 +739,9 @@ compile_device_mapper() {
                [ ! -d "${DEVICE_MAPPER_DIR}" ] &&
                        gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
                cd "${DEVICE_MAPPER_DIR}"
-               mymapperconf="--enable-static_link"
-               ###mymapperconf="--disable-selinux ${mymapperconf}"
-               ./configure  --prefix=${TEMP}/device-mapper ${mymapperconf} \
-                       >> ${DEBUGFILE} 2>&1 || gen_die 'Configuring device-mapper failed!'
+               ./configure --prefix=${TEMP}/device-mapper --enable-static_link \
+                       --disable-selinux >> ${DEBUGFILE} 2>&1 ||
+                       gen_die 'Configuring device-mapper failed!'
                print_info 1 'device-mapper: >> Compiling...'
                compile_generic '' utils
                compile_generic 'install' utils