zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Matthew Burgess 2012-02-10 22:35:59 +00:00
parent 92256610ee
commit 3158dfaccd
4 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Config.in
View file

@ -780,21 +780,6 @@ menu "--- General Settings"
# As a last resort, the files will dowloaded from upstream, # As a last resort, the files will dowloaded from upstream,
# if possible. # 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 config RUNMAKE
bool "Run the makefile" bool "Run the makefile"
default n default n

4
common/libs/func_download_pkgs
View file

@ -45,10 +45,6 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
*/vim-*-lang* ) */vim-*-lang* )
[[ "$VIMLANG" = "0" ]] && continue [[ "$VIMLANG" = "0" ]] && continue
;; ;;
*linux/linux-* )
[[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
[[ "$GETKERNEL" = "n" ]] && continue
;;
esac esac
# Locations # Locations

5
common/libs/func_validate_configs.sh
View file

@ -24,7 +24,7 @@ inline_doc
local -r BOOK_clfsX="ARCH TARGET" local -r BOOK_clfsX="ARCH TARGET"
local -r GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \ local -r GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \ SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
GETKERNEL RUNMAKE" RUNMAKE"
local -r BUILD_chroot="TEST BOMB_TEST STRIP" local -r BUILD_chroot="TEST BOMB_TEST STRIP"
local -r BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG" local -r BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
local -r ADVANCED_chroot="COMPARE RUN_ICA RUN_FARCE ITERATIONS OPTIMIZE" local -r ADVANCED_chroot="COMPARE RUN_ICA RUN_FARCE ITERATIONS OPTIMIZE"
@ -133,9 +133,6 @@ inline_doc
for config_param in ${!PARAM_GROUP}; do for config_param in ${!PARAM_GROUP}; do
case $config_param in case $config_param in
# Envvars that depend on other settings to be displayed # 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`" ;; COMPARE) [[ ! "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
RUN_ICA) [[ "$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`" ;; RUN_FARCE) [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;

1
jhalfs
View file

@ -98,7 +98,6 @@ source configuration
# default value is n(o). # default value is n(o).
RUNMAKE=${RUNMAKE:-n} RUNMAKE=${RUNMAKE:-n}
GETPKG=${GETPKG:-n} GETPKG=${GETPKG:-n}
GETKERNEL=${GETKERNEL:-n}
COMPARE=${COMPARE:-n} COMPARE=${COMPARE:-n}
RUN_FARCE=${RUN_FARCE:-n} RUN_FARCE=${RUN_FARCE:-n}
RUN_ICA=${RUN_ICA:-n} RUN_ICA=${RUN_ICA:-n}