r3687 - jhalfs/trunk/LFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Mar 27 07:50:42 PDT 2013


Author: pierre
Date: Wed Mar 27 07:50:42 2013
New Revision: 3687

Log:
Retry failed commit r3686: LFS/master.sh:
- Ignore error when useradd does not support "-k /dev/null" (happens at
least on Suse)
- strip "-libstdc++" from the script name to allow building gcc-libstdc++
with package gcc

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==============================================================================
--- jhalfs/trunk/LFS/master.sh	Wed Mar 27 07:39:06 2013	(r3686)
+++ jhalfs/trunk/LFS/master.sh	Wed Mar 27 07:50:42 2013	(r3687)
@@ -29,7 +29,7 @@
 
 021-addinguser:  020-creatingtoolsdir
 	@\$(call echo_message, Building)
-	@if [ ! -d \$(LUSER_HOME) ]; then \\
+	@-if [ ! -d \$(LUSER_HOME) ]; then \\
 		groupadd \$(LGROUP); \\
 		useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
 	else \\
@@ -102,7 +102,9 @@
 
     # Grab the name of the target (minus the -pass1 or -pass2 in the case of gcc
     # and binutils in chapter 5)
-    name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' -e 's at -pass[0-9]\{1\}@@'`
+    name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' \
+                                    -e 's at -pass[0-9]\{1\}@@' \
+                                    -e 's at -libstdc++@@'`
 
     # Set the dependency for the first target.
     if [ -z $PREV ] ; then PREV=022-settingenvironment ; fi



More information about the alfs-log mailing list