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

Moved test for the existance of to the top of the case statement

Browse source
This commit is contained in:
George Boudreau 2006-03-10 13:55:19 +00:00
parent 12a5707998
commit 4845f38453
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
CLFS/master.sh
View file

@ -371,19 +371,18 @@ boot_Makefiles() { #
*grub*) continue ;; *grub*) continue ;;
*whatnext*) continue ;; *whatnext*) continue ;;
*settingenvironment*) sed 's@PS1=@set +h\nPS1=@' -i $file ;; *settingenvironment*) sed 's@PS1=@set +h\nPS1=@' -i $file ;;
*kernel) *kernel) # if there is no kernel config file do not build the kernel
sed "s|make mrproper|make mrproper\ncp $CONFIG .config|" -i $file [[ -z $CONFIG ]] && continue
# You cannot run menuconfig from within the makefile sed "s|make mrproper|make mrproper\ncp $CONFIG .config|" -i $file
sed 's|menuconfig|oldconfig|' -i $file # You cannot run menuconfig from within the makefile
#If defined include the keymap in the kernel sed 's|menuconfig|oldconfig|' -i $file
if [[ -n "$KEYMAP" ]]; then #If defined include the keymap in the kernel
sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file if [[ -n "$KEYMAP" ]]; then
else sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file
sed '/loadkeys -m/d' -i $file else
sed '/drivers\/char/d' -i $file sed '/loadkeys -m/d' -i $file
fi sed '/drivers\/char/d' -i $file
# if there is no kernel config file do not build the kernel fi
[[ -z $CONFIG ]] && continue
;; ;;
esac esac
# #
@ -1017,6 +1016,8 @@ bootable_Makefiles() { #
case $this_script in case $this_script in
*grub*) continue ;; *grub*) continue ;;
*kernel) *kernel)
# if there is no kernel config file do not build the kernel
[[ -z $CONFIG ]] && continue
sed "s|make mrproper|make mrproper\ncp $CONFIG .config|" -i $file sed "s|make mrproper|make mrproper\ncp $CONFIG .config|" -i $file
# You cannot run menuconfig from within the makefile # You cannot run menuconfig from within the makefile
sed 's|menuconfig|oldconfig|' -i $file sed 's|menuconfig|oldconfig|' -i $file
@ -1027,8 +1028,6 @@ bootable_Makefiles() { #
sed '/loadkeys -m/d' -i $file sed '/loadkeys -m/d' -i $file
sed '/drivers\/char/d' -i $file sed '/drivers\/char/d' -i $file
fi fi
# if there is no kernel config file do not build the kernel
[[ -z $CONFIG ]] && continue
;; ;;
esac esac
# #
@ -1097,7 +1096,10 @@ bm_bootable_Makefiles() { #
# A little housekeeping on the scripts # A little housekeeping on the scripts
case $this_script in case $this_script in
*grub*) continue ;; *grub*) continue ;;
*kernel) cfg_file="/sources/`basename $CONFIG`" *kernel)
# if there is no kernel config file do not build the kernel
[[ -z $CONFIG ]] && continue
cfg_file="/sources/`basename $CONFIG`"
sed "s|make mrproper|make mrproper\ncp $cfg_file .config|" -i $file sed "s|make mrproper|make mrproper\ncp $cfg_file .config|" -i $file
# You cannot run menuconfig from within the makefile # You cannot run menuconfig from within the makefile
sed 's|menuconfig|oldconfig|' -i $file sed 's|menuconfig|oldconfig|' -i $file
@ -1108,8 +1110,6 @@ bm_bootable_Makefiles() { #
sed '/loadkeys -m/d' -i $file sed '/loadkeys -m/d' -i $file
sed '/drivers\/char/d' -i $file sed '/drivers\/char/d' -i $file
fi fi
# if there is no kernel config file do not build the kernel
[[ -z $CONFIG ]] && continue
;; ;;
esac esac
# #