From: Chris Gianelloni Date: Thu, 14 Dec 2006 18:15:16 +0000 (+0000) Subject: Adjust selinux stuff in gen_compile.sh to actually do what we intended, not the opposite. X-Git-Tag: v3.4.10.902~279 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2056384a9042b09a2ea81a4bb44297429bec0009;p=genkernel.git 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 dc025f7..4e50f5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Dec 2006; Chris Gianelloni gen_compile.sh: + Adjust selinux stuff in gen_compile.sh to actually do what we intended, not + the opposite. + 14 Dec 2006; Chris Gianelloni 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 c8abc5e..702ba2d 100644 --- 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