Hi all,

The kernel package has been required since LFS-6.3.  LFS-6.2 was
released 5.5 years ago, which was the last release when the kernel
package wasn't required until chapter 8.  As such, the attached patch
removes the ability to choose whether or not to download the kernel
package.

Regards,

Matt.
Index: jhalfs-trunk/Config.in
===================================================================
--- jhalfs-trunk.orig/Config.in
+++ jhalfs-trunk/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
Index: jhalfs-trunk/common/libs/func_download_pkgs
===================================================================
--- jhalfs-trunk.orig/common/libs/func_download_pkgs
+++ jhalfs-trunk/common/libs/func_download_pkgs
@@ -46,8 +46,7 @@ get_sources() {              # Download
             [[ "$VIMLANG" = "0" ]] && continue
           ;;
       *linux/linux-* )
-            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
-            [[ "$GETKERNEL" = "n" ]] && continue
+            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && continue
           ;;
     esac
 
Index: jhalfs-trunk/common/libs/func_validate_configs.sh
===================================================================
--- jhalfs-trunk.orig/common/libs/func_validate_configs.sh
+++ jhalfs-trunk/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`" ;;
Index: jhalfs-trunk/jhalfs
===================================================================
--- jhalfs-trunk.orig/jhalfs
+++ jhalfs-trunk/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}
-- 
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to