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

LFS/master.sh -- removed bash patch for copying CONFIG, now done via XSL

Browse source
This commit is contained in:
George Boudreau 2006-03-10 22:27:16 +00:00
parent 6aeb5b7494
commit 821a2c6d3d
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
HLFS/master.sh
View file

@ -174,9 +174,9 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
# Skip this script depending on jhalfs.conf flags set.
case $this_script in
# If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
*tcl* ) [[ "$TOOLCHAINTEST" = "0" ]] && continue; ;;
*expect* ) [[ "$TOOLCHAINTEST" = "0" ]] && continue; ;;
*dejagnu* ) [[ "$TOOLCHAINTEST" = "0" ]] && continue; ;;
*tcl* ) [[ "$TEST" = "0" ]] && continue; ;;
*expect* ) [[ "$TEST" = "0" ]] && continue; ;;
*dejagnu* ) [[ "$TEST" = "0" ]] && continue; ;;
# Test if the stripping phase must be skipped
*stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
# Select the appropriate library
@ -451,7 +451,10 @@ chapter7_Makefiles() { # Create a bootable system.. kernel, bootscripts..e
*reboot) continue ;;
*console) continue ;; # Use the file generated by lfs-bootscripts
*kernel) # How does Manuel add this string to the file..
*kernel)
# If no .config file is supplied, the kernel build is skipped
[[ -z $CONFIG ]] && continue
# How does Manuel add this string to the file..
sed 's|cd \$PKGDIR.*||' -i chapter07/$this_script
# You cannot run menuconfig from within the makefile
sed 's|make menuconfig|make oldconfig|' -i chapter07/$this_script
@ -465,8 +468,6 @@ chapter7_Makefiles() { # Create a bootable system.. kernel, bootscripts..e
sed '/loadkeys -m/d' -i chapter07/$this_script
sed '/drivers\/char/d' -i chapter07/$this_script
fi
# If no .config file is supplied, the kernel build is skipped
[[ -z $CONFIG ]] && continue
;;
*usage) # The script bombs, disable error trapping
sed 's|set -e|set +e|' -i chapter07/$this_script

9
LFS/master.sh
View file

@ -260,15 +260,6 @@ chapter789_Makefiles() {
wrt_unpack2 "$FILE"
fi
# Put in place the kernel .config file
if [[ `_IS_ ${this_script} kernel` ]] ; then
(
cat << EOF
@cp $CONFIG \$(MOUNT_PT)/sources/kernel-config
EOF
) >> $MKFILE.tmp
fi
# Check if we have a real /etc/fstab file
if [[ `_IS_ ${this_script} fstab` ]] && [[ -n "$FSTAB" ]] ; then
wrt_copy_fstab "${this_script}"