/[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.62 Revision 1.80
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.62 2009/09/06 22:54:58 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.80 2010/01/10 09:25:12 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="kernel_linux? ( virtual/linux-sources )" 109DEPEND=""
114RDEPEND="" 110RDEPEND=""
115 111
116# Overwritable environment Var's 112# Overwritable environment Var's
117# --------------------------------------- 113# ---------------------------------------
118KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}" 114KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}"
… …
200 ERROR=0 196 ERROR=0
201 mycat='cat' 197 mycat='cat'
202 198
203 [ -z "${1}" ] && ERROR=1 199 [ -z "${1}" ] && ERROR=1
204 [ ! -f "${2}" ] && ERROR=1 200 [ ! -f "${2}" ] && ERROR=1
205 [ "${2#.gz}" != "${2}" ] && mycat='zcat' 201 [ "${2%.gz}" != "${2}" ] && mycat='zcat'
206 202
207 if [ "${ERROR}" = 1 ] 203 if [ "${ERROR}" = 1 ]
208 then 204 then
209 echo -e "\n" 205 echo -e "\n"
210 eerror "getfilevar_noexec requires 2 variables, with the second a valid file." 206 eerror "getfilevar_noexec requires 2 variables, with the second a valid file."
… …
218 p 214 p
219 }" 215 }"
220 fi 216 fi
221} 217}
222 218
219# @PRIVATE-VARIABLE: _LINUX_CONFIG_EXISTS_DONE
220# @DESCRIPTION:
221# This is only set if one of the linux_config_*exists functions has been called.
222# We use it for a QA warning that the check for a config has not been performed,
223# as linux_chkconfig* in non-legacy mode WILL return an undefined value if no
224# config is available at all.
225_LINUX_CONFIG_EXISTS_DONE=
226
227linux_config_qa_check() {
228 local f="$1"
229 if [ -z "${_LINUX_CONFIG_EXISTS_DONE}" ]; then
230 ewarn "QA: You called $f before any linux_config_exists!"
231 ewarn "QA: The return value of $f will NOT gaurenteed later!"
232 fi
233}
223 234
224# @FUNCTION: linux_config_src_exists 235# @FUNCTION: linux_config_src_exists
225# @RETURN: true or false 236# @RETURN: true or false
226# @DESCRIPTION: 237# @DESCRIPTION:
227# It returns true if .config exists in a build directory otherwise false 238# It returns true if .config exists in a build directory otherwise false
228linux_config_src_exists() { 239linux_config_src_exists() {
240 export _LINUX_CONFIG_EXISTS_DONE=1
229 [ -s "${KV_OUT_DIR}/.config" ] 241 [ -s "${KV_OUT_DIR}/.config" ]
230} 242}
231 243
232# @FUNCTION: linux_config_bin_exists 244# @FUNCTION: linux_config_bin_exists
233# @RETURN: true or false 245# @RETURN: true or false
234# @DESCRIPTION: 246# @DESCRIPTION:
235# It returns true if .config exists in /proc, otherwise false 247# It returns true if .config exists in /proc, otherwise false
236linux_config_bin_exists() { 248linux_config_bin_exists() {
249 export _LINUX_CONFIG_EXISTS_DONE=1
237 [ -s "/proc/config.gz" ] 250 [ -s "/proc/config.gz" ]
238} 251}
239 252
240# @FUNCTION: linux_config_exists 253# @FUNCTION: linux_config_exists
241# @RETURN: true or false 254# @RETURN: true or false
… …
268# @DESCRIPTION: 281# @DESCRIPTION:
269# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config 282# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config
270# If linux_config_exists returns false, the results of this are UNDEFINED. You 283# If linux_config_exists returns false, the results of this are UNDEFINED. You
271# MUST call linux_config_exists first. 284# MUST call linux_config_exists first.
272linux_chkconfig_present() { 285linux_chkconfig_present() {
286 linux_config_qa_check linux_chkconfig_present
273local RESULT 287 local RESULT
274 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel
275 local config 288 local config
276 config="${KV_OUT_DIR}/.config" 289 config="${KV_OUT_DIR}/.config"
277 [ ! -f "${config}" ] && config="/proc/config.gz" 290 [ ! -f "${config}" ] && config="/proc/config.gz"
278 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")" 291 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
279 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1 292 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1
… …
285# @DESCRIPTION: 298# @DESCRIPTION:
286# It checks that CONFIG_<option>=m is present in the current kernel .config 299# It checks that CONFIG_<option>=m is present in the current kernel .config
287# If linux_config_exists returns false, the results of this are UNDEFINED. You 300# If linux_config_exists returns false, the results of this are UNDEFINED. You
288# MUST call linux_config_exists first. 301# MUST call linux_config_exists first.
289linux_chkconfig_module() { 302linux_chkconfig_module() {
303 linux_config_qa_check linux_chkconfig_module
290local RESULT 304 local RESULT
291 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel
292 local config 305 local config
293 config="${KV_OUT_DIR}/.config" 306 config="${KV_OUT_DIR}/.config"
294 [ ! -f "${config}" ] && config="/proc/config.gz" 307 [ ! -f "${config}" ] && config="/proc/config.gz"
295 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")" 308 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
296 [ "${RESULT}" = "m" ] && return 0 || return 1 309 [ "${RESULT}" = "m" ] && return 0 || return 1
… …
302# @DESCRIPTION: 315# @DESCRIPTION:
303# It checks that CONFIG_<option>=y is present in the current kernel .config 316# It checks that CONFIG_<option>=y is present in the current kernel .config
304# If linux_config_exists returns false, the results of this are UNDEFINED. You 317# If linux_config_exists returns false, the results of this are UNDEFINED. You
305# MUST call linux_config_exists first. 318# MUST call linux_config_exists first.
306linux_chkconfig_builtin() { 319linux_chkconfig_builtin() {
320 linux_config_qa_check linux_chkconfig_builtin
307local RESULT 321 local RESULT
308 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel
309 local config 322 local config
310 config="${KV_OUT_DIR}/.config" 323 config="${KV_OUT_DIR}/.config"
311 [ ! -f "${config}" ] && config="/proc/config.gz" 324 [ ! -f "${config}" ] && config="/proc/config.gz"
312 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")" 325 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
313 [ "${RESULT}" = "y" ] && return 0 || return 1 326 [ "${RESULT}" = "y" ] && return 0 || return 1
… …
319# @DESCRIPTION: 332# @DESCRIPTION:
320# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel). 333# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel).
321# If linux_config_exists returns false, the results of this are UNDEFINED. You 334# If linux_config_exists returns false, the results of this are UNDEFINED. You
322# MUST call linux_config_exists first. 335# MUST call linux_config_exists first.
323linux_chkconfig_string() { 336linux_chkconfig_string() {
324 [ -z "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel 337 linux_config_qa_check linux_chkconfig_string
325 local config 338 local config
326 config="${KV_OUT_DIR}/.config" 339 config="${KV_OUT_DIR}/.config"
327 [ ! -f "${config}" ] && config="/proc/config.gz" 340 [ ! -f "${config}" ] && config="/proc/config.gz"
328 getfilevar_noexec "CONFIG_${1}" "${config}" 341 getfilevar_noexec "CONFIG_${1}" "${config}"
329} 342}
… …
349 362
350# got the jist yet? 363# got the jist yet?
351 364
352kernel_is() { 365kernel_is() {
353 # if we haven't determined the version yet, we need to. 366 # if we haven't determined the version yet, we need to.
354 get_version 367 linux-info_get_any_version
368
355 local operator test value x=0 y=0 z=0 369 local operator testagainst value x=0 y=0 z=0
356 370
357 case ${1} in 371 case ${1} in
358 lt) operator="-lt"; shift;; 372 -lt|lt) operator="-lt"; shift;;
359 gt) operator="-gt"; shift;; 373 -gt|gt) operator="-gt"; shift;;
360 le) operator="-le"; shift;; 374 -le|le) operator="-le"; shift;;
361 ge) operator="-ge"; shift;; 375 -ge|ge) operator="-ge"; shift;;
362 eq) operator="-eq"; shift;; 376 -eq|eq) operator="-eq"; shift;;
363 *) operator="-eq";; 377 *) operator="-eq";;
364 esac 378 esac
365 379
366 for x in ${@}; do 380 for x in ${@}; do
367 for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done 381 for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
368 value="${value}${x}" 382 value="${value}${x}"
369 z=$((${z} + 1)) 383 z=$((${z} + 1))
370 384
371 case ${z} in 385 case ${z} in
372 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done; 386 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do testagainst="${testagainst}0"; done;
373 test="${test}${KV_MAJOR}";; 387 testagainst="${testagainst}${KV_MAJOR}";;
374 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done; 388 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do testagainst="${testagainst}0"; done;
375 test="${test}${KV_MINOR}";; 389 testagainst="${testagainst}${KV_MINOR}";;
376 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done; 390 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do testagainst="${testagainst}0"; done;
377 test="${test}${KV_PATCH}";; 391 testagainst="${testagainst}${KV_PATCH}";;
378 *) die "Error in kernel-2_kernel_is(): Too many parameters.";; 392 *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
379 esac 393 esac
380 done 394 done
381 395
382 [ ${test} ${operator} ${value} ] && return 0 || return 1 396 [ "${testagainst}" ${operator} "${value}" ] && return 0 || return 1
383} 397}
384 398
385get_localversion() { 399get_localversion() {
386 local lv_list i x 400 local lv_list i x
387 401
… …
395 done 409 done
396 x=${x/ /} 410 x=${x/ /}
397 echo ${x} 411 echo ${x}
398} 412}
399 413
414# internal variable, so we know to only print the warning once
415get_version_warning_done=
416
400# @FUNCTION: get_version 417# @FUNCTION: get_version
401# @DESCRIPTION: 418# @DESCRIPTION:
402# It gets the version of the kernel inside KERNEL_DIR and populates the KV_FULL variable 419# It gets the version of the kernel inside KERNEL_DIR and populates the KV_FULL variable
403# (if KV_FULL is already set it does nothing). 420# (if KV_FULL is already set it does nothing).
404# 421#
… …
417 # if we dont know KV_FULL, then we need too. 434 # if we dont know KV_FULL, then we need too.
418 # make sure KV_DIR isnt set since we need to work it out via KERNEL_DIR 435 # make sure KV_DIR isnt set since we need to work it out via KERNEL_DIR
419 unset KV_DIR 436 unset KV_DIR
420 437
421 # KV_DIR will contain the full path to the sources directory we should use 438 # KV_DIR will contain the full path to the sources directory we should use
439 [ -z "${get_version_warning_done}" ] && \
422 qeinfo "Determining the location of the kernel source code" 440 qeinfo "Determining the location of the kernel source code"
423 [ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})" 441 [ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})"
424 [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}" 442 [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}"
425 443
426 if [ -z "${KV_DIR}" ] 444 if [ -z "${KV_DIR}" ]
427 then 445 then
446 if [ -z "${get_version_warning_done}" ]; then
447 get_version_warning_done=1
428 qeerror "Unable to find kernel sources at ${KERNEL_DIR}" 448 qeerror "Unable to find kernel sources at ${KERNEL_DIR}"
429 qeinfo "This package requires Linux sources." 449 #qeinfo "This package requires Linux sources."
430 if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then 450 if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then
431 qeinfo "Please make sure that ${KERNEL_DIR} points at your running kernel, " 451 qeinfo "Please make sure that ${KERNEL_DIR} points at your running kernel, "
432 qeinfo "(or the kernel you wish to build against)." 452 qeinfo "(or the kernel you wish to build against)."
433 qeinfo "Alternatively, set the KERNEL_DIR environment variable to the kernel sources location" 453 qeinfo "Alternatively, set the KERNEL_DIR environment variable to the kernel sources location"
434 else 454 else
435 qeinfo "Please ensure that the KERNEL_DIR environment variable points at full Linux sources of the kernel you wish to compile against." 455 qeinfo "Please ensure that the KERNEL_DIR environment variable points at full Linux sources of the kernel you wish to compile against."
456 fi
436 fi 457 fi
437 return 1 458 return 1
438 fi 459 fi
439 460
461 if [ -z "${get_version_warning_done}" ]; then
440 qeinfo "Found kernel source directory:" 462 qeinfo "Found kernel source directory:"
441 qeinfo " ${KV_DIR}" 463 qeinfo " ${KV_DIR}"
464 fi
442 465
443 if [ ! -s "${KV_DIR}/Makefile" ] 466 if [ ! -s "${KV_DIR}/Makefile" ]
444 then 467 then
468 if [ -z "${get_version_warning_done}" ]; then
469 get_version_warning_done=1
445 qeerror "Could not find a Makefile in the kernel source directory." 470 qeerror "Could not find a Makefile in the kernel source directory."
446 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources" 471 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources"
472 fi
447 return 1 473 return 1
448 fi 474 fi
449 475
450 # OK so now we know our sources directory, but they might be using 476 # OK so now we know our sources directory, but they might be using
451 # KBUILD_OUTPUT, and we need this for .config and localversions-* 477 # KBUILD_OUTPUT, and we need this for .config and localversions-*
452 # so we better find it eh? 478 # so we better find it eh?
453 # do we pass KBUILD_OUTPUT on the CLI? 479 # do we pass KBUILD_OUTPUT on the CLI?
454 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}" 480 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}"
455 481
482 # keep track of it
483 KERNEL_MAKEFILE="${KV_DIR}/Makefile"
484
485 # Check if the Makefile is valid for direct parsing.
486 # Check status results:
487 # - PASS, use 'getfilevar' to extract values
488 # - FAIL, use 'getfilevar_noexec' to extract values
489 # The check may fail if:
490 # - make is not present
491 # - corruption exists in the kernel makefile
492 local a='' b='' mkfunc='getfilevar'
493 a="$(getfilevar VERSION ${KERNEL_MAKEFILE})"
494 b="$(getfilevar_noexec VERSION ${KERNEL_MAKEFILE})"
495 [[ "${a}" != "${b}" ]] && mkfunc='getfilevar_noexec'
496
456 # And if we didn't pass it, we can take a nosey in the Makefile 497 # And if we didn't pass it, we can take a nosey in the Makefile
457 kbuild_output="$(getfilevar_noexec KBUILD_OUTPUT ${KV_DIR}/Makefile)" 498 kbuild_output="$(${mkfunc} KBUILD_OUTPUT ${KERNEL_MAKEFILE})"
458 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}" 499 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}"
459 500
460 # And contrary to existing functions I feel we shouldn't trust the 501 # And contrary to existing functions I feel we shouldn't trust the
461 # directory name to find version information as this seems insane. 502 # directory name to find version information as this seems insane.
462 # so we parse ${KV_DIR}/Makefile 503 # so we parse ${KERNEL_MAKEFILE}
463 KV_MAJOR="$(getfilevar_noexec VERSION ${KV_DIR}/Makefile)" 504 KV_MAJOR="$(${mkfunc} VERSION ${KERNEL_MAKEFILE})"
464 KV_MINOR="$(getfilevar_noexec PATCHLEVEL ${KV_DIR}/Makefile)" 505 KV_MINOR="$(${mkfunc} PATCHLEVEL ${KERNEL_MAKEFILE})"
465 KV_PATCH="$(getfilevar_noexec SUBLEVEL ${KV_DIR}/Makefile)" 506 KV_PATCH="$(${mkfunc} SUBLEVEL ${KERNEL_MAKEFILE})"
466 KV_EXTRA="$(getfilevar_noexec EXTRAVERSION ${KV_DIR}/Makefile)" 507 KV_EXTRA="$(${mkfunc} EXTRAVERSION ${KERNEL_MAKEFILE})"
467 508
468 if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ] 509 if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ]
469 then 510 then
511 if [ -z "${get_version_warning_done}" ]; then
512 get_version_warning_done=1
470 qeerror "Could not detect kernel version." 513 qeerror "Could not detect kernel version."
471 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources." 514 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources."
515 fi
472 return 1 516 return 1
473 fi 517 fi
474 518
475 # and in newer versions we can also pull LOCALVERSION if it is set. 519 # and in newer versions we can also pull LOCALVERSION if it is set.
476 # but before we do this, we need to find if we use a different object directory. 520 # but before we do this, we need to find if we use a different object directory.
… …
490 fi 534 fi
491 # and if we STILL have not got it, then we better just set it to KV_DIR 535 # and if we STILL have not got it, then we better just set it to KV_DIR
492 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}" 536 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
493 537
494 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})" 538 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})"
495 if linux_config_exists; then 539 if linux_config_src_exists; then
496 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)" 540 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)"
497 KV_LOCAL="${KV_LOCAL//\"/}" 541 KV_LOCAL="${KV_LOCAL//\"/}"
498 542
499 # For things like git that can append extra stuff: 543 # For things like git that can append extra stuff:
500 [ -e ${KV_DIR}/scripts/setlocalversion ] && 544 [ -e ${KV_DIR}/scripts/setlocalversion ] &&
… …
537 && KV_EXTRA="-${KV_FULL#*-}" 581 && KV_EXTRA="-${KV_FULL#*-}"
538 fi 582 fi
539 return 0 583 return 0
540} 584}
541 585
586# This next function is named with the eclass prefix to avoid conflicts with
587# some old versionator-like eclass functions.
588
589# @FUNCTION: linux-info_get_any_version
590# @DESCRIPTION:
591# This attempts to find the version of the sources, and otherwise falls back to
592# the version of the running kernel.
593linux-info_get_any_version() {
594 get_version
595 if [[ $? -ne 0 ]]; then
596 ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version"
597 get_running_version
598 fi
599}
600
542 601
543# ebuild check functions 602# ebuild check functions
544# --------------------------------------- 603# ---------------------------------------
545 604
546# @FUNCTION: check_kernel_built 605# @FUNCTION: check_kernel_built
… …
588# It checks the kernel config options specified by CONFIG_CHECK. It dies only when a required config option (i.e. 647# It checks the kernel config options specified by CONFIG_CHECK. It dies only when a required config option (i.e.
589# the prefix ~ is not used) doesn't satisfy the directive. 648# the prefix ~ is not used) doesn't satisfy the directive.
590check_extra_config() { 649check_extra_config() {
591 local config negate die error reworkmodulenames 650 local config negate die error reworkmodulenames
592 local soft_errors_count=0 hard_errors_count=0 config_required=0 651 local soft_errors_count=0 hard_errors_count=0 config_required=0
652 # store the value of the QA check, because otherwise we won't catch usages
653 # after if check_extra_config is called AND other direct calls are done
654 # later.
655 local old_LINUX_CONFIG_EXISTS_DONE="${_LINUX_CONFIG_EXISTS_DONE}"
593 656
594 # if we haven't determined the version yet, we need to 657 # if we haven't determined the version yet, we need to
595 get_version 658 linux-info_get_any_version
596 659
597 # Determine if we really need a .config. The only time when we don't need 660 # Determine if we really need a .config. The only time when we don't need
598 # one is when all of the CONFIG_CHECK options are prefixed with "~". 661 # one is when all of the CONFIG_CHECK options are prefixed with "~".
599 for config in ${CONFIG_CHECK} 662 for config in ${CONFIG_CHECK}
600 do 663 do
… …
608 # In the case where we don't require a .config, we can now bail out 671 # In the case where we don't require a .config, we can now bail out
609 # if the user has no .config as there is nothing to do. Otherwise 672 # if the user has no .config as there is nothing to do. Otherwise
610 # code later will cause a failure due to missing .config. 673 # code later will cause a failure due to missing .config.
611 if ! linux_config_exists; then 674 if ! linux_config_exists; then
612 ewarn "Unable to check for the following kernel config options due" 675 ewarn "Unable to check for the following kernel config options due"
613 ewarn "to absence of any configured kernel sources:" 676 ewarn "to absence of any configured kernel sources or compiled"
677 ewarn "config:"
614 for config in ${CONFIG_CHECK}; do 678 for config in ${CONFIG_CHECK}; do
679 local_error="ERROR_${config#\~}"
680 msg="${!local_error}"
681 if [[ "x${msg}" == "x" ]]; then
682 local_error="WARNING_${config#\~}"
683 msg="${!local_error}"
684 fi
615 ewarn " - ${config#\~}" 685 ewarn " - ${config#\~}${msg:+ - }${msg}"
616 done 686 done
617 ewarn "You're on your own to make sure they are set if needed." 687 ewarn "You're on your own to make sure they are set if needed."
688 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
618 return 0 689 return 0
619 fi 690 fi
620 else 691 else
621 require_configured_kernel 692 require_configured_kernel
622 fi 693 fi
… …
699 if [[ ${hard_errors_count} > 0 ]]; then 770 if [[ ${hard_errors_count} > 0 ]]; then
700 eerror "Please check to make sure these options are set correctly." 771 eerror "Please check to make sure these options are set correctly."
701 eerror "Failure to do so may cause unexpected problems." 772 eerror "Failure to do so may cause unexpected problems."
702 eerror "Once you have satisfied these options, please try merging" 773 eerror "Once you have satisfied these options, please try merging"
703 eerror "this package again." 774 eerror "this package again."
775 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
704 die "Incorrect kernel configuration options" 776 die "Incorrect kernel configuration options"
705 elif [[ ${soft_errors_count} > 0 ]]; then 777 elif [[ ${soft_errors_count} > 0 ]]; then
706 ewarn "Please check to make sure these options are set correctly." 778 ewarn "Please check to make sure these options are set correctly."
707 ewarn "Failure to do so may cause unexpected problems." 779 ewarn "Failure to do so may cause unexpected problems."
708 else 780 else
709 eend 0 781 eend 0
710 fi 782 fi
783 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
711} 784}
712 785
713check_zlibinflate() { 786check_zlibinflate() {
714 # if we haven't determined the version yet, we need to 787 # if we haven't determined the version yet, we need to
715 require_configured_kernel 788 require_configured_kernel
… …
786# @FUNCTION: linux-info_pkg_setup 859# @FUNCTION: linux-info_pkg_setup
787# @DESCRIPTION: 860# @DESCRIPTION:
788# Force a get_version() call when inherited from linux-mod.eclass and then check if the kernel is configured 861# Force a get_version() call when inherited from linux-mod.eclass and then check if the kernel is configured
789# to support the options specified in CONFIG_CHECK (if not null) 862# to support the options specified in CONFIG_CHECK (if not null)
790linux-info_pkg_setup() { 863linux-info_pkg_setup() {
791 get_version 864 linux-info_get_any_version
792 if [[ $rc -ne 0 ]]; then
793 ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version"
794 get_running_version
795 fi
796 865
797 if kernel_is 2 4; then 866 if kernel_is 2 4; then
798 if [ "$( gcc-major-version )" -eq "4" ] ; then 867 if [ "$( gcc-major-version )" -eq "4" ] ; then
799 echo 868 echo
800 ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with" 869 ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with"
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.80
  ViewVC Help
Powered by ViewVC 1.1.13