/[gentoo-x86]/eclass/linux-info.eclass
Gentoo

Diff of /eclass/linux-info.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.68 Revision 1.83
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.68 2009/09/06 23:36:04 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.83 2010/01/17 21:46:55 robbat2 Exp $
4# 4#
5# Original author: John Mylchreest <johnm@gentoo.org> 5# Original author: John Mylchreest <johnm@gentoo.org>
6# Maintainer: kernel-misc@gentoo.org 6# Maintainer: kernel-misc@gentoo.org
7# 7#
8# Please direct your bugs to the current eclass maintainer :) 8# Please direct your bugs to the current eclass maintainer :)
… …
99# @ECLASS-VARIABLE: KV_OUT_DIR 99# @ECLASS-VARIABLE: KV_OUT_DIR
100# @DESCRIPTION: 100# @DESCRIPTION:
101# A read-only variable. It's a string containing the kernel object directory, will be KV_DIR unless 101# A read-only variable. It's a string containing the kernel object directory, will be KV_DIR unless
102# KBUILD_OUTPUT is used. This should be used for referencing .config. 102# KBUILD_OUTPUT is used. This should be used for referencing .config.
103 103
104# @ECLASS-VARIABLE: I_KNOW_WHAT_I_AM_DOING
105# @DESCRIPTION:
106# Temporary variable for the migration to making linux-info non-fatal.
107
108# And to ensure all the weirdness with crosscompile 104# And to ensure all the weirdness with crosscompile
109inherit toolchain-funcs versionator 105inherit toolchain-funcs versionator
110 106
111EXPORT_FUNCTIONS pkg_setup 107EXPORT_FUNCTIONS pkg_setup
112 108
113DEPEND="" 109DEPEND=""
114RDEPEND="" 110RDEPEND=""
115
116[ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && \
117DEPEND="kernel_linux? ( virtual/linux-sources )"
118 111
119# Overwritable environment Var's 112# Overwritable environment Var's
120# --------------------------------------- 113# ---------------------------------------
121KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}" 114KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}"
122 115
… …
153 esac 146 esac
154 [ -n "${outputmsg}" ] && ${type} "${outputmsg}" 147 [ -n "${outputmsg}" ] && ${type} "${outputmsg}"
155} 148}
156 149
157qeinfo() { qout einfo "${@}" ; } 150qeinfo() { qout einfo "${@}" ; }
151qewarn() { qout ewarn "${@}" ; }
158qeerror() { qout eerror "${@}" ; } 152qeerror() { qout eerror "${@}" ; }
159 153
160# File Functions 154# File Functions
161# --------------------------------------- 155# ---------------------------------------
162 156
… …
213 eerror "getfilevar_noexec requires 2 variables, with the second a valid file." 207 eerror "getfilevar_noexec requires 2 variables, with the second a valid file."
214 eerror " getfilevar_noexec <VARIABLE> <CONFIGFILE>" 208 eerror " getfilevar_noexec <VARIABLE> <CONFIGFILE>"
215 else 209 else
216 ${mycat} "${2}" | \ 210 ${mycat} "${2}" | \
217 sed -n \ 211 sed -n \
218 -e "/^[[:space:]]*${1}[[:space:]]*=[[:space:]]*\(.*\)\$/{ 212 -e "/^[[:space:]]*${1}[[:space:]]*:\\?=[[:space:]]*\(.*\)\$/{
219 s,^[^=]*[[:space:]]*=[[:space:]]*,,g ; 213 s,^[^=]*[[:space:]]*=[[:space:]]*,,g ;
220 s,[[:space:]]*\$,,g ; 214 s,[[:space:]]*\$,,g ;
221 p 215 p
222 }" 216 }"
223 fi 217 fi
224} 218}
225 219
220# @PRIVATE-VARIABLE: _LINUX_CONFIG_EXISTS_DONE
221# @DESCRIPTION:
222# This is only set if one of the linux_config_*exists functions has been called.
223# We use it for a QA warning that the check for a config has not been performed,
224# as linux_chkconfig* in non-legacy mode WILL return an undefined value if no
225# config is available at all.
226_LINUX_CONFIG_EXISTS_DONE=
227
228linux_config_qa_check() {
229 local f="$1"
230 if [ -z "${_LINUX_CONFIG_EXISTS_DONE}" ]; then
231 ewarn "QA: You called $f before any linux_config_exists!"
232 ewarn "QA: The return value of $f will NOT gaurenteed later!"
233 fi
234}
226 235
227# @FUNCTION: linux_config_src_exists 236# @FUNCTION: linux_config_src_exists
228# @RETURN: true or false 237# @RETURN: true or false
229# @DESCRIPTION: 238# @DESCRIPTION:
230# It returns true if .config exists in a build directory otherwise false 239# It returns true if .config exists in a build directory otherwise false
231linux_config_src_exists() { 240linux_config_src_exists() {
241 export _LINUX_CONFIG_EXISTS_DONE=1
232 [ -s "${KV_OUT_DIR}/.config" ] 242 [ -s "${KV_OUT_DIR}/.config" ]
233} 243}
234 244
235# @FUNCTION: linux_config_bin_exists 245# @FUNCTION: linux_config_bin_exists
236# @RETURN: true or false 246# @RETURN: true or false
237# @DESCRIPTION: 247# @DESCRIPTION:
238# It returns true if .config exists in /proc, otherwise false 248# It returns true if .config exists in /proc, otherwise false
239linux_config_bin_exists() { 249linux_config_bin_exists() {
250 export _LINUX_CONFIG_EXISTS_DONE=1
240 [ -s "/proc/config.gz" ] 251 [ -s "/proc/config.gz" ]
241} 252}
242 253
243# @FUNCTION: linux_config_exists 254# @FUNCTION: linux_config_exists
244# @RETURN: true or false 255# @RETURN: true or false
… …
271# @DESCRIPTION: 282# @DESCRIPTION:
272# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config 283# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config
273# If linux_config_exists returns false, the results of this are UNDEFINED. You 284# If linux_config_exists returns false, the results of this are UNDEFINED. You
274# MUST call linux_config_exists first. 285# MUST call linux_config_exists first.
275linux_chkconfig_present() { 286linux_chkconfig_present() {
287 linux_config_qa_check linux_chkconfig_present
276local RESULT 288 local RESULT
277 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel
278 local config 289 local config
279 config="${KV_OUT_DIR}/.config" 290 config="${KV_OUT_DIR}/.config"
280 [ ! -f "${config}" ] && config="/proc/config.gz" 291 [ ! -f "${config}" ] && config="/proc/config.gz"
281 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")" 292 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
282 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1 293 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1
… …
288# @DESCRIPTION: 299# @DESCRIPTION:
289# It checks that CONFIG_<option>=m is present in the current kernel .config 300# It checks that CONFIG_<option>=m is present in the current kernel .config
290# If linux_config_exists returns false, the results of this are UNDEFINED. You 301# If linux_config_exists returns false, the results of this are UNDEFINED. You
291# MUST call linux_config_exists first. 302# MUST call linux_config_exists first.
292linux_chkconfig_module() { 303linux_chkconfig_module() {
304 linux_config_qa_check linux_chkconfig_module
293local RESULT 305 local RESULT
294 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel
295 local config 306 local config
296 config="${KV_OUT_DIR}/.config" 307 config="${KV_OUT_DIR}/.config"
297 [ ! -f "${config}" ] && config="/proc/config.gz" 308 [ ! -f "${config}" ] && config="/proc/config.gz"
298 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")" 309 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
299 [ "${RESULT}" = "m" ] && return 0 || return 1 310 [ "${RESULT}" = "m" ] && return 0 || return 1
… …
305# @DESCRIPTION: 316# @DESCRIPTION:
306# It checks that CONFIG_<option>=y is present in the current kernel .config 317# It checks that CONFIG_<option>=y is present in the current kernel .config
307# If linux_config_exists returns false, the results of this are UNDEFINED. You 318# If linux_config_exists returns false, the results of this are UNDEFINED. You
308# MUST call linux_config_exists first. 319# MUST call linux_config_exists first.
309linux_chkconfig_builtin() { 320linux_chkconfig_builtin() {
321 linux_config_qa_check linux_chkconfig_builtin
310local RESULT 322 local RESULT
311 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel
312 local config 323 local config
313 config="${KV_OUT_DIR}/.config" 324 config="${KV_OUT_DIR}/.config"
314 [ ! -f "${config}" ] && config="/proc/config.gz" 325 [ ! -f "${config}" ] && config="/proc/config.gz"
315 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")" 326 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
316 [ "${RESULT}" = "y" ] && return 0 || return 1 327 [ "${RESULT}" = "y" ] && return 0 || return 1
… …
322# @DESCRIPTION: 333# @DESCRIPTION:
323# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel). 334# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel).
324# If linux_config_exists returns false, the results of this are UNDEFINED. You 335# If linux_config_exists returns false, the results of this are UNDEFINED. You
325# MUST call linux_config_exists first. 336# MUST call linux_config_exists first.
326linux_chkconfig_string() { 337linux_chkconfig_string() {
327 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel 338 linux_config_qa_check linux_chkconfig_string
328 local config 339 local config
329 config="${KV_OUT_DIR}/.config" 340 config="${KV_OUT_DIR}/.config"
330 [ ! -f "${config}" ] && config="/proc/config.gz" 341 [ ! -f "${config}" ] && config="/proc/config.gz"
331 getfilevar_noexec "CONFIG_${1}" "${config}" 342 getfilevar_noexec "CONFIG_${1}" "${config}"
332} 343}
… …
352 363
353# got the jist yet? 364# got the jist yet?
354 365
355kernel_is() { 366kernel_is() {
356 # if we haven't determined the version yet, we need to. 367 # if we haven't determined the version yet, we need to.
357 get_version 368 linux-info_get_any_version
369
358 local operator test value x=0 y=0 z=0 370 local operator testagainst value x=0 y=0 z=0
359 371
360 case ${1} in 372 case ${1} in
361 -lt|lt) operator="-lt"; shift;; 373 -lt|lt) operator="-lt"; shift;;
362 -gt|gt) operator="-gt"; shift;; 374 -gt|gt) operator="-gt"; shift;;
363 -le|le) operator="-le"; shift;; 375 -le|le) operator="-le"; shift;;
… …
370 for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done 382 for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
371 value="${value}${x}" 383 value="${value}${x}"
372 z=$((${z} + 1)) 384 z=$((${z} + 1))
373 385
374 case ${z} in 386 case ${z} in
375 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done; 387 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do testagainst="${testagainst}0"; done;
376 test="${test}${KV_MAJOR}";; 388 testagainst="${testagainst}${KV_MAJOR}";;
377 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done; 389 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do testagainst="${testagainst}0"; done;
378 test="${test}${KV_MINOR}";; 390 testagainst="${testagainst}${KV_MINOR}";;
379 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done; 391 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do testagainst="${testagainst}0"; done;
380 test="${test}${KV_PATCH}";; 392 testagainst="${testagainst}${KV_PATCH}";;
381 *) die "Error in kernel-2_kernel_is(): Too many parameters.";; 393 *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
382 esac 394 esac
383 done 395 done
384 396
385 [ ${test} ${operator} ${value} ] && return 0 || return 1 397 [ "${testagainst}" ${operator} "${value}" ] && return 0 || return 1
386} 398}
387 399
388get_localversion() { 400get_localversion() {
389 local lv_list i x 401 local lv_list i x
390 402
… …
398 done 410 done
399 x=${x/ /} 411 x=${x/ /}
400 echo ${x} 412 echo ${x}
401} 413}
402 414
415# Check if the Makefile is valid for direct parsing.
416# Check status results:
417# - PASS, use 'getfilevar' to extract values
418# - FAIL, use 'getfilevar_noexec' to extract values
419# The check may fail if:
420# - make is not present
421# - corruption exists in the kernel makefile
422get_makefile_extract_function() {
423 local a='' b='' mkfunc='getfilevar'
424 a="$(getfilevar VERSION ${KERNEL_MAKEFILE})"
425 b="$(getfilevar_noexec VERSION ${KERNEL_MAKEFILE})"
426 [[ "${a}" != "${b}" ]] && mkfunc='getfilevar_noexec'
427 echo "${mkfunc}"
428}
429
403# internal variable, so we know to only print the warning once 430# internal variable, so we know to only print the warning once
404get_version_warning_done= 431get_version_warning_done=
405 432
406# @FUNCTION: get_version 433# @FUNCTION: get_version
407# @DESCRIPTION: 434# @DESCRIPTION:
… …
412# 439#
413# The KV_DIR is set using the KERNEL_DIR env var, the KV_DIR_OUT is set using a valid 440# The KV_DIR is set using the KERNEL_DIR env var, the KV_DIR_OUT is set using a valid
414# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the 441# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the
415# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build). 442# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build).
416get_version() { 443get_version() {
417 local kbuild_output 444 local kbuild_output mkfunc
418 445
419 # no need to execute this twice assuming KV_FULL is populated. 446 # no need to execute this twice assuming KV_FULL is populated.
420 # we can force by unsetting KV_FULL 447 # we can force by unsetting KV_FULL
421 [ -n "${KV_FULL}" ] && return 0 448 [ -n "${KV_FULL}" ] && return 0
422 449
… …
466 # KBUILD_OUTPUT, and we need this for .config and localversions-* 493 # KBUILD_OUTPUT, and we need this for .config and localversions-*
467 # so we better find it eh? 494 # so we better find it eh?
468 # do we pass KBUILD_OUTPUT on the CLI? 495 # do we pass KBUILD_OUTPUT on the CLI?
469 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}" 496 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}"
470 497
498 # keep track of it
499 KERNEL_MAKEFILE="${KV_DIR}/Makefile"
500
501 # Decide the function used to extract makefile variables.
502 mkfunc="$(get_makefile_extract_function "${KERNEL_MAKEFILE}")"
503
471 # And if we didn't pass it, we can take a nosey in the Makefile 504 # And if we didn't pass it, we can take a nosey in the Makefile
472 kbuild_output="$(getfilevar_noexec KBUILD_OUTPUT ${KV_DIR}/Makefile)" 505 kbuild_output="$(${mkfunc} KBUILD_OUTPUT ${KERNEL_MAKEFILE})"
473 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}" 506 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}"
474 507
475 # And contrary to existing functions I feel we shouldn't trust the 508 # And contrary to existing functions I feel we shouldn't trust the
476 # directory name to find version information as this seems insane. 509 # directory name to find version information as this seems insane.
477 # so we parse ${KV_DIR}/Makefile 510 # so we parse ${KERNEL_MAKEFILE}
478 KV_MAJOR="$(getfilevar_noexec VERSION ${KV_DIR}/Makefile)" 511 KV_MAJOR="$(${mkfunc} VERSION ${KERNEL_MAKEFILE})"
479 KV_MINOR="$(getfilevar_noexec PATCHLEVEL ${KV_DIR}/Makefile)" 512 KV_MINOR="$(${mkfunc} PATCHLEVEL ${KERNEL_MAKEFILE})"
480 KV_PATCH="$(getfilevar_noexec SUBLEVEL ${KV_DIR}/Makefile)" 513 KV_PATCH="$(${mkfunc} SUBLEVEL ${KERNEL_MAKEFILE})"
481 KV_EXTRA="$(getfilevar_noexec EXTRAVERSION ${KV_DIR}/Makefile)" 514 KV_EXTRA="$(${mkfunc} EXTRAVERSION ${KERNEL_MAKEFILE})"
482 515
483 if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ] 516 if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ]
484 then 517 then
485 if [ -z "${get_version_warning_done}" ]; then 518 if [ -z "${get_version_warning_done}" ]; then
486 get_version_warning_done=1 519 get_version_warning_done=1
… …
492 525
493 # and in newer versions we can also pull LOCALVERSION if it is set. 526 # and in newer versions we can also pull LOCALVERSION if it is set.
494 # but before we do this, we need to find if we use a different object directory. 527 # but before we do this, we need to find if we use a different object directory.
495 # This *WILL* break if the user is using localversions, but we assume it was 528 # This *WILL* break if the user is using localversions, but we assume it was
496 # caught before this if they are. 529 # caught before this if they are.
497 [ "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}" == "$(uname -r)" ] && \
498 OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build}" 530 OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build}"
499 531
500 [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})" 532 [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})"
501 [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}" 533 [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
502 if [ -n "${KV_OUT_DIR}" ]; 534 if [ -n "${KV_OUT_DIR}" ];
503 then 535 then
… …
508 fi 540 fi
509 # and if we STILL have not got it, then we better just set it to KV_DIR 541 # and if we STILL have not got it, then we better just set it to KV_DIR
510 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}" 542 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
511 543
512 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})" 544 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})"
513 if linux_config_exists; then 545 if linux_config_src_exists; then
514 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)" 546 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)"
515 KV_LOCAL="${KV_LOCAL//\"/}" 547 KV_LOCAL="${KV_LOCAL//\"/}"
516 548
517 # For things like git that can append extra stuff: 549 # For things like git that can append extra stuff:
518 [ -e ${KV_DIR}/scripts/setlocalversion ] && 550 [ -e ${KV_DIR}/scripts/setlocalversion ] &&
… …
563# @FUNCTION: linux-info_get_any_version 595# @FUNCTION: linux-info_get_any_version
564# @DESCRIPTION: 596# @DESCRIPTION:
565# This attempts to find the version of the sources, and otherwise falls back to 597# This attempts to find the version of the sources, and otherwise falls back to
566# the version of the running kernel. 598# the version of the running kernel.
567linux-info_get_any_version() { 599linux-info_get_any_version() {
568 get_version 600 get_version
569 if [[ $? -ne 0 ]]; then 601 if [[ $? -ne 0 ]]; then
570 ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version" 602 ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version"
571 get_running_version 603 get_running_version
572 fi 604 fi
573} 605}
574 606
575 607
576# ebuild check functions 608# ebuild check functions
… …
621# It checks the kernel config options specified by CONFIG_CHECK. It dies only when a required config option (i.e. 653# It checks the kernel config options specified by CONFIG_CHECK. It dies only when a required config option (i.e.
622# the prefix ~ is not used) doesn't satisfy the directive. 654# the prefix ~ is not used) doesn't satisfy the directive.
623check_extra_config() { 655check_extra_config() {
624 local config negate die error reworkmodulenames 656 local config negate die error reworkmodulenames
625 local soft_errors_count=0 hard_errors_count=0 config_required=0 657 local soft_errors_count=0 hard_errors_count=0 config_required=0
658 # store the value of the QA check, because otherwise we won't catch usages
659 # after if check_extra_config is called AND other direct calls are done
660 # later.
661 local old_LINUX_CONFIG_EXISTS_DONE="${_LINUX_CONFIG_EXISTS_DONE}"
626 662
627 # if we haven't determined the version yet, we need to 663 # if we haven't determined the version yet, we need to
628 get_version 664 linux-info_get_any_version
629 665
630 # Determine if we really need a .config. The only time when we don't need 666 # Determine if we really need a .config. The only time when we don't need
631 # one is when all of the CONFIG_CHECK options are prefixed with "~". 667 # one is when all of the CONFIG_CHECK options are prefixed with "~".
632 for config in ${CONFIG_CHECK} 668 for config in ${CONFIG_CHECK}
633 do 669 do
… …
644 if ! linux_config_exists; then 680 if ! linux_config_exists; then
645 ewarn "Unable to check for the following kernel config options due" 681 ewarn "Unable to check for the following kernel config options due"
646 ewarn "to absence of any configured kernel sources or compiled" 682 ewarn "to absence of any configured kernel sources or compiled"
647 ewarn "config:" 683 ewarn "config:"
648 for config in ${CONFIG_CHECK}; do 684 for config in ${CONFIG_CHECK}; do
685 local_error="ERROR_${config#\~}"
686 msg="${!local_error}"
687 if [[ "x${msg}" == "x" ]]; then
688 local_error="WARNING_${config#\~}"
689 msg="${!local_error}"
690 fi
649 ewarn " - ${config#\~}" 691 ewarn " - ${config#\~}${msg:+ - }${msg}"
650 done 692 done
651 ewarn "You're on your own to make sure they are set if needed." 693 ewarn "You're on your own to make sure they are set if needed."
694 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
652 return 0 695 return 0
653 fi 696 fi
654 else 697 else
655 [ -n "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel 698 require_configured_kernel
656 fi 699 fi
657 700
658 einfo "Checking for suitable kernel configuration options..." 701 einfo "Checking for suitable kernel configuration options..."
659 702
660 for config in ${CONFIG_CHECK} 703 for config in ${CONFIG_CHECK}
… …
733 if [[ ${hard_errors_count} > 0 ]]; then 776 if [[ ${hard_errors_count} > 0 ]]; then
734 eerror "Please check to make sure these options are set correctly." 777 eerror "Please check to make sure these options are set correctly."
735 eerror "Failure to do so may cause unexpected problems." 778 eerror "Failure to do so may cause unexpected problems."
736 eerror "Once you have satisfied these options, please try merging" 779 eerror "Once you have satisfied these options, please try merging"
737 eerror "this package again." 780 eerror "this package again."
781 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
738 die "Incorrect kernel configuration options" 782 die "Incorrect kernel configuration options"
739 elif [[ ${soft_errors_count} > 0 ]]; then 783 elif [[ ${soft_errors_count} > 0 ]]; then
740 ewarn "Please check to make sure these options are set correctly." 784 ewarn "Please check to make sure these options are set correctly."
741 ewarn "Failure to do so may cause unexpected problems." 785 ewarn "Failure to do so may cause unexpected problems."
742 else 786 else
743 eend 0 787 eend 0
744 fi 788 fi
789 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
745} 790}
746 791
747check_zlibinflate() { 792check_zlibinflate() {
748 # if we haven't determined the version yet, we need to 793 # if we haven't determined the version yet, we need to
749 require_configured_kernel 794 require_configured_kernel
Legend:
Removed from v.1.68  
changed lines
  Added in v.1.83
  ViewVC Help
Powered by ViewVC 1.1.13