Changeset 3158dfa

Timestamp:

02/10/2012 10:35:59 PM (12 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

4fa38dd

Parents:

9225661

Message:

Remove GETKERNEL parameter. The kernel has been required for its headers since LFS-6.3.

Files:

• Config.in (modified) (1 diff)
• common/libs/func_download_pkgs (modified) (1 diff)
• common/libs/func_validate_configs.sh (modified) (2 diffs)
• jhalfs (modified) (1 diff)

Config.in

@@ -781 +781 @@
                         #   if possible.
 
-        config  GETKERNEL
-                bool    "Always retrieve kernel package (see help)"
-                default y if BOOK_LFS || BOOK_HLFS
-                depends GETPKG
-                help
-                        #-- Get the kernel package and patches even if no kernel
-                        #   configuration file has been supplied.
-
-                        # NOTE:
-                        #   The kernel package must be available when building
-                        #   the SVN version of LFS or HLFS to can install the
-                        #   headers files.
-                        #
-                        #   If building LFS-6.2 this setting can be disabled.
-
         config  RUNMAKE
                 bool    "Run the makefile"

common/libs/func_download_pkgs

@@ -45 +45 @@
       */vim-*-lang* )
             [[ "$VIMLANG" = "0" ]] && continue
-          ;;
-      *linux/linux-* )
-            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
-            [[ "$GETKERNEL" = "n" ]] && continue
           ;;
     esac

common/libs/func_validate_configs.sh

@@ -25 +25 @@
   local -r  GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
                             SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
-                            GETKERNEL RUNMAKE"
+                            RUNMAKE"
   local -r    BUILD_chroot="TEST BOMB_TEST STRIP"
   local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
@@ -134 +134 @@
     case $config_param in
       # Envvars that depend on other settings to be displayed
-      GETKERNEL ) if [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] ; then
-                    [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`"
-                  fi ;;
       COMPARE)          [[ ! "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       RUN_ICA)          [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;

jhalfs

@@ -99 +99 @@
 RUNMAKE=${RUNMAKE:-n}
 GETPKG=${GETPKG:-n}
-GETKERNEL=${GETKERNEL:-n}
 COMPARE=${COMPARE:-n}
 RUN_FARCE=${RUN_FARCE:-n}