Changeset 0271c0c

Timestamp:

03/21/2006 01:25:20 PM (19 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

a9490ab

Parents:

b0976d2

Message:

Standardized handling of the optional param CONFIG

Files:

• CLFS/master.sh (modified) (3 diffs)
• HLFS/master.sh (modified) (1 diff)
• LFS/master.sh (modified) (1 diff)
• common/common-functions (modified) (1 diff)

CLFS/master.sh

@@ -217 +217 @@
       *whatnext*) continue     ;;
       *settingenvironment*) sed 's@PS1=@set +h\nPS1=@' -i $file  ;;
-      *kernel)   # if there is no kernel config file do not build the 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
-                # You cannot run menuconfig from within the makefile
+                  # Copy the config file to /sources with a standardized name
+                cp -v $CONFIG $BUILDDIR/sources/kernel-config
+                sed "s|make mrproper|make mrproper\ncp /sources/kernel-config .config|" -i $file
+                  # You cannot run menuconfig from within the makefile
                 sed 's|menuconfig|oldconfig|'     -i $file
-                #If defined include the keymap in the kernel
+                  #If defined include the keymap in the kernel
                 if [[ -n "$KEYMAP" ]]; then
                   sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file
@@ -857 +859 @@
       *grub*)     continue ;;
       *kernel)
-               # if there is no kernel config file do not build the 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
-               # You cannot run menuconfig from within the makefile
+                 # Copy the config file to /sources with a standardized name
+               cp -v $CONFIG $BUILDDIR/sources/kernel-config
+               sed "s|make mrproper|make mrproper\ncp /sources/kernel-config .config|" -i $file
+                 # You cannot run menuconfig from within the makefile
                sed 's|menuconfig|oldconfig|'     -i $file
-               # If defined include the keymap in the kernel
+                 # If defined include the keymap in the kernel
                if [[ -n "$KEYMAP" ]]; then
                  sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file
@@ -938 +942 @@
       *grub*)     continue  ;;
       *kernel)
-               # if there is no kernel config file do not build the 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
-               # You cannot run menuconfig from within the makefile
+                 # Copy the named config file to /sources with a standardized name
+               cp -v $CONFIG $BUILDDIR/sources/kernel-config
+               sed "s|make mrproper|make mrproper\ncp ../kernel-config .config|" -i $file
+                 # You cannot run menuconfig from within the makefile
                sed 's|menuconfig|oldconfig|'     -i $file
-               # If defined include the keymap in the kernel
+                 # If defined include the keymap in the kernel
                if [[ -n "$KEYMAP" ]]; then
                  sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file

HLFS/master.sh

@@ -456 +456 @@
     fi
 
-    if [[ `_IS_ $this_script kernel` ]] ; then
-      # not much really, script does everything..
-      echo -e "\t@cp -f $CONFIG \$(MOUNT_PT)/sources/kernel-config" >> $MKFILE.tmp
-    fi
-
     # Check if we have a real /etc/fstab file
     if [[ `_IS_ $this_script fstab` ]] && [[ -n "$FSTAB" ]] ; then

LFS/master.sh

@@ -223 +223 @@
     # should enter the chroot environment to create the root
     # password, edit several files and setup Grub.
-    if [[ `_IS_ ${this_script} grub` ]] || [[ `_IS_ ${this_script} reboot` ]] ; then
-       continue
-    fi
-
+    #
     # If no .config file is supplied, the kernel build is skipped
-    if [ -z $CONFIG ] && [[ `_IS_ ${this_script} kernel` ]] ; then
-      continue
-    fi
+    #
+    case ${this_script} in
+      *grub)    continue ;;
+      *reboot)  continue ;;
+      *kernel)  [[ -z ${CONFIG} ]] && continue
+                cp ${CONFIG} $BUILDDIR/sources/kernel-config  ;;
+    esac
 
     # First append each name of the script files to a list (this will become

common/common-functions

@@ -723 +723 @@
                                                -e 's@">@"@' \
                                                -e '/generic/d' >> packages
+      echo " ...OK"
       ;; 
   esac