From 3158dfaccdde6b2406ba54d0f47bcf483240d342 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 10 Feb 2012 22:35:59 +0000
Subject: [PATCH] Remove GETKERNEL parameter. The kernel has been required for
 its headers since LFS-6.3.

---
 Config.in                            | 15 ---------------
 common/libs/func_download_pkgs       |  4 ----
 common/libs/func_validate_configs.sh |  5 +----
 jhalfs                               |  1 -
 4 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Config.in b/Config.in
index b193ed8..d9762e0 100644
--- a/Config.in
+++ b/Config.in
@@ -780,21 +780,6 @@ menu "--- General Settings"
 			#   As a last resort, the files will dowloaded from upstream,
                         #   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"
 		default n
diff --git a/common/libs/func_download_pkgs b/common/libs/func_download_pkgs
index d93bda9..0aec02f 100644
--- a/common/libs/func_download_pkgs
+++ b/common/libs/func_download_pkgs
@@ -45,10 +45,6 @@ get_sources() {              # Download file, write name to MISSING_FILES.DMP if
       */vim-*-lang* )
             [[ "$VIMLANG" = "0" ]] && continue
           ;;
-      *linux/linux-* )
-            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
-            [[ "$GETKERNEL" = "n" ]] && continue
-          ;;
     esac
 
       # Locations
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index 466dde4..705cc6d 100644
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@@ -24,7 +24,7 @@ inline_doc
   local -r      BOOK_clfsX="ARCH TARGET"
   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"
   local -r ADVANCED_chroot="COMPARE RUN_ICA RUN_FARCE ITERATIONS OPTIMIZE"
@@ -133,9 +133,6 @@ inline_doc
   for config_param in ${!PARAM_GROUP}; do
     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`" ;;
       RUN_FARCE)        [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
diff --git a/jhalfs b/jhalfs
index 7135a97..e7c55b6 100755
--- a/jhalfs
+++ b/jhalfs
@@ -98,7 +98,6 @@ source configuration
 #  default value is n(o).
 RUNMAKE=${RUNMAKE:-n}
 GETPKG=${GETPKG:-n}
-GETKERNEL=${GETKERNEL:-n}
 COMPARE=${COMPARE:-n}
 RUN_FARCE=${RUN_FARCE:-n}
 RUN_ICA=${RUN_ICA:-n}