--- linux-info.eclass.getfilevar 2005-12-31 17:35:38.000000000 -0800 +++ linux-info.eclass 2006-01-11 01:25:57.000000000 -0800 @@ -288,9 +288,18 @@ KV_LOCAL="$(get_localversion ${KV_OUT_DIR})" fi - # and if we STILL haven't got it, then we better just set it to KV_DIR + # and if we STILL have not got it, then we better just set it to KV_DIR KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}" + if [ ! -s "${KV_OUT_DIR}/.config" ] + then + qeerror "Could not find a usable .config in the kernel source directory." + qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources." + qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that" + qeerror "it points to the necessary object directory so that it might find .config." + return 1 + fi + KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})" KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)" KV_LOCAL="${KV_LOCAL//\"/}" @@ -301,15 +310,6 @@ qeinfo "Found sources for kernel version:" qeinfo " ${KV_FULL}" - if [ ! -s "${KV_OUT_DIR}/.config" ] - then - qeerror "Could not find a usable .config in the kernel source directory." - qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources." - qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that" - qeerror "it points to the necessary object directory so that it might find .config." - return 1 - fi - return 0 }