Changeset 821a2c6

Timestamp:

03/10/2006 10:27:16 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

dd810ea

Parents:

6aeb5b7

Message:

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

Files:

• HLFS/master.sh (modified) (3 diffs)
• LFS/master.sh (modified) (1 diff)

HLFS/master.sh

@@ -175 +175 @@
     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 ;;
@@ -452 +452 @@
       *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
@@ -466 +469 @@
           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

LFS/master.sh

@@ -261 +261 @@
     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