zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Retry failed commit r3686: LFS/master.sh:

Browse source 
- 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
This commit is contained in:
Pierre Labastie 2013-03-27 14:50:42 +00:00
parent 8418e9b896
commit 18499359b0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
LFS/master.sh
View file

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