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

Merged r2196, r2197 and r2202 from trunk.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2005-11-23 20:26:36 +00:00
parent 171c81e985
commit b6ca3232fb
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
jhalfs
View file

@ -327,6 +327,10 @@ _IS_() # Function to test build scripts names
#----------------------------# #----------------------------#
chapter4_Makefiles() { chapter4_Makefiles() {
#----------------------------# #----------------------------#
# If /home/lfs is already present in the host, we asume that the
# lfs user and group are also presents in the host, and a backup
# of their bash init files is made.
( (
cat << EOF cat << EOF
020-creatingtoolsdir: 020-creatingtoolsdir:
@ -338,14 +342,24 @@ chapter4_Makefiles() {
021-addinguser: 020-creatingtoolsdir 021-addinguser: 020-creatingtoolsdir
@\$(call echo_message, Building) @\$(call echo_message, Building)
@groupadd lfs && \\ @if [ ! -d /home/lfs ]; then \\
useradd -s /bin/bash -g lfs -m -k /dev/null lfs && \\ groupadd lfs; \\
chown lfs \$(LFS)/tools && \\ useradd -s /bin/bash -g lfs -m -k /dev/null lfs; \\
else \\
touch user-lfs-exist; \\
fi;
@chown lfs \$(LFS)/tools && \\
chown lfs \$(LFS)/sources && \\ chown lfs \$(LFS)/sources && \\
touch \$@ touch \$@
022-settingenvironment: 021-addinguser 022-settingenvironment: 021-addinguser
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ -f /home/lfs/.bashrc -a ! -f /home/lfs/.bashrc.XXX ]; then \\
mv -v /home/lfs/.bashrc /home/lfs/.bashrc.XXX; \\
fi;
@if [ -f /home/lfs/.bash_profile -a ! -f /home/lfs/.bash_profile.XXX ]; then \\
mv -v /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\
fi;
@echo "set +h" > /home/lfs/.bashrc && \\ @echo "set +h" > /home/lfs/.bashrc && \\
echo "umask 022" >> /home/lfs/.bashrc && \\ echo "umask 022" >> /home/lfs/.bashrc && \\
echo "LFS=/mnt/lfs" >> /home/lfs/.bashrc && \\ echo "LFS=/mnt/lfs" >> /home/lfs/.bashrc && \\
@ -819,28 +833,30 @@ all: chapter4 chapter5 chapter6 chapter789
chapter4: 020-creatingtoolsdir 021-addinguser 022-settingenvironment chapter4: 020-creatingtoolsdir 021-addinguser 022-settingenvironment
chapter5: chapter4 $chapter5 chapter5: chapter4 $chapter5 restore-lfs-env
chapter6: chapter5 $chapter6 chapter6: chapter5 $chapter6
chapter789: chapter6 $chapter789 chapter789: chapter6 $chapter789
clean-all: clean clean-all: clean
rm -rf ./* rm -rf ./{commands,logs,Makefile,dump-lfs-scripts.xsl,functions,packages,patches}
clean: clean-chapter789 clean-chapter6 clean-chapter5 clean-chapter4 clean: clean-chapter789 clean-chapter6 clean-chapter5 clean-chapter4
clean-chapter4: clean-chapter4:
-userdel lfs -if [ ! -f user-lfs-exist ]; then \\
rm -rf /home/lfs userdel lfs; \\
rm -rf /home/lfs; \\
fi;
rm -rf \$(LFS)/tools rm -rf \$(LFS)/tools
rm -f /tools rm -f /tools
rm -f envars rm -f envars user-lfs-exist
rm -f 02* logs/02*.log rm -f 02* logs/02*.log
clean-chapter5: clean-chapter5:
rm -rf \$(LFS)/tools/* rm -rf \$(LFS)/tools/*
rm -f $chapter5 rm -f $chapter5 restore-lfs-env sources-dir
cd logs && rm -f $chapter5 && cd .. cd logs && rm -f $chapter5 && cd ..
clean-chapter6: clean-chapter6:
@ -857,6 +873,16 @@ clean-chapter789:
rm -f $chapter789 rm -f $chapter789
cd logs && rm -f $chapter789 && cd .. cd logs && rm -f $chapter789 && cd ..
restore-lfs-env:
@\$(call echo_message, Building)
@if [ -f /home/lfs/.bashrc.XXX ]; then \\
mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
fi;
@if [ -f /home/lfs/.bash_profile.XXX ]; then \\
mv -v /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
fi;
@chown lfs:lfs /home/lfs/.bash* && \\
touch \$@
EOF EOF
) >> $MKFILE ) >> $MKFILE