[SM-Commit] GIT changes to master grimoire by David Brown (1205a5b7816ea5e458eed8bc52c29426d7f6df61)

David Brown scm at sourcemage.org
Fri Sep 14 11:00:32 EDT 2007


GIT changes to master grimoire by David Brown <dmlb2000 at gmail.com>:

 utils/coreutils/CONFIGURE |    2 +-
 utils/coreutils/HISTORY   |    4 ++++
 utils/coreutils/PRE_BUILD |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1205a5b7816ea5e458eed8bc52c29426d7f6df61
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    coreutils fixed more selinux stuff from last night... need to stop coding like mad when its too late

commit 3e759007af9cbf24b070fd68f0ee80486f4a96d3
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    coreutils fixed PRE_BUILD check for enableing the patch or not

diff --git a/utils/coreutils/CONFIGURE b/utils/coreutils/CONFIGURE
index 016a15d..db4798e 100755
--- a/utils/coreutils/CONFIGURE
+++ b/utils/coreutils/CONFIGURE
@@ -1 +1 @@
-config_query_option SELINUX "Enable SELinux patches?" n '--with-selinux' '--without-selinux'
+config_query_option SELINUX "Enable SELinux patches?" n '--enable-selinux' ''
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 9cdc764..d7ba31a 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,7 @@
+2007-09-14 David Brown <dmlb2000 at gmail.com>
+	* PRE_BUILD: forgot to change the patch check to --enable-selinux
+	* CONFIGURE: should be --enable not --with 
+
 2007-09-13 David Brown <dmlb2000 at gmail.com>  
 	* PRE_BUILD: added glibc 2.6.1 patch for futimens function
 	* coreutils-futimens.patch: added patch to internalize the futimens
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index 9a6bd23..c035bae 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -6,7 +6,7 @@ cd  $SOURCE_DIRECTORY  &&
 # Don't install coreutils' hostname  (Bug #7089)
 #
 patch  -p1  <  $SCRIPT_DIRECTORY/hostname.diff &&
-if [[ $SELINUX == y ]]
+if [[ $SELINUX == '--enable-selinux' ]]
 then
   patch -p1 < ${SCRIPT_DIRECTORY}/coreutils-selinux.patch
 fi &&



More information about the SM-Commit mailing list