/[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.34 Revision 1.82
1# Copyright 1999-2004 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.34 2005/12/30 18:36:39 johnm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.82 2010/01/17 21:34:52 robbat2 Exp $
4# 4#
5# Description: This eclass is used as a central eclass for accessing kernel
6# related information for sources already installed.
7# It is vital for linux-mod to function correctly, and is split
8# out so that any ebuild behaviour "templates" are abstracted out
9# using additional eclasses.
10#
11# Maintainer: John Mylchreest <johnm@gentoo.org> 5# Original author: John Mylchreest <johnm@gentoo.org>
12# Copyright 2004 Gentoo Linux 6# Maintainer: kernel-misc@gentoo.org
13# 7#
14# Please direct your bugs to the current eclass maintainer :) 8# Please direct your bugs to the current eclass maintainer :)
9
10# @ECLASS: linux-info.eclass
11# @MAINTAINER:
12# kernel-misc@gentoo.org
13# @BLURB: eclass used for accessing kernel related information
14# @DESCRIPTION:
15# This eclass is used as a central eclass for accessing kernel
16# related information for source or binary already installed.
17# It is vital for linux-mod.eclass to function correctly, and is split
18# out so that any ebuild behaviour "templates" are abstracted out
19# using additional eclasses.
20#
21# "kernel config" in this file means:
22# The .config of the currently installed sources is used as the first
23# preference, with a fall-back to bundled config (/proc/config.gz) if available.
15 24
16# A Couple of env vars are available to effect usage of this eclass 25# A Couple of env vars are available to effect usage of this eclass
17# These are as follows: 26# These are as follows:
18# 27
19# Env Var Option Description 28# @ECLASS-VARIABLE: KERNEL_DIR
20# KERNEL_DIR <string> The directory containing kernel the target kernel 29# @DESCRIPTION:
21# sources. 30# A string containing the directory of the target kernel sources. The default value is
31# "/usr/src/linux"
32
33# @ECLASS-VARIABLE: CONFIG_CHECK
34# @DESCRIPTION:
22# CONFIG_CHECK <string> a list of .config options to check for before 35# A string containing a list of .config options to check for before
23# proceeding with the install. ie: CONFIG_CHECK="MTRR" 36# proceeding with the install.
37#
38# e.g.: CONFIG_CHECK="MTRR"
39#
24# You can also check that an option doesn't exist by 40# You can also check that an option doesn't exist by
25# prepending it with an exclamation mark (!). 41# prepending it with an exclamation mark (!).
42#
26# ie: CONFIG_CHECK="!MTRR" 43# e.g.: CONFIG_CHECK="!MTRR"
27# ERROR_CFG <string> The error message to display when the above check 44#
45# To simply warn about a missing option, prepend a '~'.
46# It may be combined with '!'.
47#
48# In general, most checks should be non-fatal. The only time fatal checks should
49# be used is for building kernel modules or cases that a compile will fail
50# without the option.
51#
52# This is to allow usage of binary kernels, and minimal systems without kernel
53# sources.
54
55# @ECLASS-VARIABLE: ERROR_<CFG>
56# @DESCRIPTION:
57# A string containing the error message to display when the check against CONFIG_CHECK
28# fails. <CFG> should reference the appropriate option 58# fails. <CFG> should reference the appropriate option used in CONFIG_CHECK.
29# as above. ie: ERROR_MTRR="MTRR exists in the .config 59#
30# but shouldn't!!" 60# e.g.: ERROR_MTRR="MTRR exists in the .config but shouldn't!!"
31# KBUILD_OUTPUT <string> This is passed on commandline, or can be set from 61
32# the kernel makefile. This contains the directory 62# @ECLASS-VARIABLE: KBUILD_OUTPUT
63# @DESCRIPTION:
64# A string passed on commandline, or set from the kernel makefile. It contains the directory
33# which is to be used as the kernel object directory. 65# which is to be used as the kernel object directory.
34 66
35# There are also a couple of variables which are set by this, and shouldn't be 67# There are also a couple of variables which are set by this, and shouldn't be
36# set by hand. These are as follows: 68# set by hand. These are as follows:
37# 69
38# Env Var Option Description 70# @ECLASS-VARIABLE: KV_FULL
39# KV_FULL <string> The full kernel version. ie: 2.6.9-gentoo-johnm-r1 71# @DESCRIPTION:
40# KV_MAJOR <integer> The kernel major version. ie: 2 72# A read-only variable. It's a string containing the full kernel version. ie: 2.6.9-gentoo-johnm-r1
41# KV_MINOR <integer> The kernel minor version. ie: 6 73
42# KV_PATCH <integer> The kernel patch version. ie: 9 74# @ECLASS-VARIABLE: KV_MAJOR
43# KV_EXTRA <string> The kernel EXTRAVERSION. ie: -gentoo 75# @DESCRIPTION:
44# KV_LOCAL <string> The kernel LOCALVERSION concatenation. ie: -johnm 76# A read-only variable. It's an integer containing the kernel major version. ie: 2
45# KV_DIR <string> The kernel source directory, will be null if 77
78# @ECLASS-VARIABLE: KV_MINOR
79# @DESCRIPTION:
80# A read-only variable. It's an integer containing the kernel minor version. ie: 6
81
82# @ECLASS-VARIABLE: KV_PATCH
83# @DESCRIPTION:
84# A read-only variable. It's an integer containing the kernel patch version. ie: 9
85
86# @ECLASS-VARIABLE: KV_EXTRA
87# @DESCRIPTION:
88# A read-only variable. It's a string containing the kernel EXTRAVERSION. ie: -gentoo
89
90# @ECLASS-VARIABLE: KV_LOCAL
91# @DESCRIPTION:
92# A read-only variable. It's a string containing the kernel LOCALVERSION concatenation. ie: -johnm
93
94# @ECLASS-VARIABLE: KV_DIR
95# @DESCRIPTION:
96# A read-only variable. It's a string containing the kernel source directory, will be null if
46# KERNEL_DIR is invalid. 97# KERNEL_DIR is invalid.
47# KV_OUT_DIR <string> The kernel object directory. will be KV_DIR unless 98
48# koutput is used. This should be used for referencing 99# @ECLASS-VARIABLE: KV_OUT_DIR
49# .config. 100# @DESCRIPTION:
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.
50 103
51# And to ensure all the weirdness with crosscompile 104# And to ensure all the weirdness with crosscompile
52inherit toolchain-funcs versionator 105inherit toolchain-funcs versionator
53 106
54EXPORT_FUNCTIONS pkg_setup 107EXPORT_FUNCTIONS pkg_setup
108
109DEPEND=""
110RDEPEND=""
55 111
56# Overwritable environment Var's 112# Overwritable environment Var's
57# --------------------------------------- 113# ---------------------------------------
58KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}" 114KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}"
59 115
63case ${ARCH} in 119case ${ARCH} in
64 ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; 120 ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
65 ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; 121 ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
66esac 122esac
67 123
68# These are legacy wrappers for toolchain-funcs. 124# @FUNCTION: set_arch_to_kernel
69# I dont like them here, but oh well. 125# @DESCRIPTION:
126# Set the env ARCH to match what the kernel expects.
70set_arch_to_kernel() { export ARCH="$(tc-arch-kernel)"; } 127set_arch_to_kernel() { export ARCH=$(tc-arch-kernel); }
128# @FUNCTION: set_arch_to_portage
129# @DESCRIPTION:
130# Set the env ARCH to match what portage expects.
71set_arch_to_portage() { export ARCH="$(tc-arch)"; } 131set_arch_to_portage() { export ARCH=$(tc-arch); }
72 132
73# qeinfo "Message" 133# qeinfo "Message"
74# ------------------- 134# -------------------
75# qeinfo is a quiet einfo call when EBUILD_PHASE 135# qeinfo is a quiet einfo call when EBUILD_PHASE
76# should not have visible output. 136# should not have visible output.
86 esac 146 esac
87 [ -n "${outputmsg}" ] && ${type} "${outputmsg}" 147 [ -n "${outputmsg}" ] && ${type} "${outputmsg}"
88} 148}
89 149
90qeinfo() { qout einfo "${@}" ; } 150qeinfo() { qout einfo "${@}" ; }
151qewarn() { qout ewarn "${@}" ; }
91qeerror() { qout eerror "${@}" ; } 152qeerror() { qout eerror "${@}" ; }
92 153
93# File Functions 154# File Functions
94# --------------------------------------- 155# ---------------------------------------
95 156
96# getfilevar accepts 2 vars as follows: 157# @FUNCTION: getfilevar
97# getfilevar <VARIABLE> <CONFIGFILE> 158# @USAGE: variable configfile
98 159# @RETURN: the value of the variable
160# @DESCRIPTION:
161# It detects the value of the variable defined in the file configfile. This is
162# done by including the configfile, and printing the variable with Make.
163# It WILL break if your makefile has missing dependencies!
99getfilevar() { 164getfilevar() {
100local ERROR workingdir basefname basedname myARCH="${ARCH}" 165local ERROR basefname basedname myARCH="${ARCH}"
101 ERROR=0 166 ERROR=0
102 167
103 [ -z "${1}" ] && ERROR=1 168 [ -z "${1}" ] && ERROR=1
104 [ ! -f "${2}" ] && ERROR=1 169 [ ! -f "${2}" ] && ERROR=1
105 170
107 then 172 then
108 echo -e "\n" 173 echo -e "\n"
109 eerror "getfilevar requires 2 variables, with the second a valid file." 174 eerror "getfilevar requires 2 variables, with the second a valid file."
110 eerror " getfilevar <VARIABLE> <CONFIGFILE>" 175 eerror " getfilevar <VARIABLE> <CONFIGFILE>"
111 else 176 else
112 workingdir="${PWD}"
113 basefname="$(basename ${2})" 177 basefname="$(basename ${2})"
114 basedname="$(dirname ${2})" 178 basedname="$(dirname ${2})"
115 unset ARCH 179 unset ARCH
116 180
117 cd "${basedname}" 181 echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
118 echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \ 182 make -C "${basedname}" M="${S}" ${BUILD_FIXES} -s -f - 2>/dev/null
119 make ${BUILD_FIXES} -s -f - e 2>/dev/null
120 cd "${workingdir}"
121 183
122 ARCH=${myARCH} 184 ARCH=${myARCH}
123 fi 185 fi
124} 186}
125 187
188# @FUNCTION: getfilevar_noexec
189# @USAGE: variable configfile
190# @RETURN: the value of the variable
191# @DESCRIPTION:
192# It detects the value of the variable defined in the file configfile.
193# This is done with sed matching an expression only. If the variable is defined,
194# you will run into problems. See getfilevar for those cases.
195getfilevar_noexec() {
196 local ERROR basefname basedname mycat myARCH="${ARCH}"
197 ERROR=0
198 mycat='cat'
199
200 [ -z "${1}" ] && ERROR=1
201 [ ! -f "${2}" ] && ERROR=1
202 [ "${2%.gz}" != "${2}" ] && mycat='zcat'
203
204 if [ "${ERROR}" = 1 ]
205 then
206 echo -e "\n"
207 eerror "getfilevar_noexec requires 2 variables, with the second a valid file."
208 eerror " getfilevar_noexec <VARIABLE> <CONFIGFILE>"
209 else
210 ${mycat} "${2}" | \
211 sed -n \
212 -e "/^[[:space:]]*${1}[[:space:]]*:\\?=[[:space:]]*\(.*\)\$/{
213 s,^[^=]*[[:space:]]*=[[:space:]]*,,g ;
214 s,[[:space:]]*\$,,g ;
215 p
216 }"
217 fi
218}
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}
235
236# @FUNCTION: linux_config_src_exists
237# @RETURN: true or false
238# @DESCRIPTION:
239# It returns true if .config exists in a build directory otherwise false
240linux_config_src_exists() {
241 export _LINUX_CONFIG_EXISTS_DONE=1
242 [ -s "${KV_OUT_DIR}/.config" ]
243}
244
245# @FUNCTION: linux_config_bin_exists
246# @RETURN: true or false
247# @DESCRIPTION:
248# It returns true if .config exists in /proc, otherwise false
249linux_config_bin_exists() {
250 export _LINUX_CONFIG_EXISTS_DONE=1
251 [ -s "/proc/config.gz" ]
252}
253
254# @FUNCTION: linux_config_exists
255# @RETURN: true or false
256# @DESCRIPTION:
257# It returns true if .config exists otherwise false
258#
259# This function MUST be checked before using any of the linux_chkconfig_*
260# functions.
261linux_config_exists() {
262 linux_config_src_exists || linux_config_bin_exists
263}
264
265# @FUNCTION: require_configured_kernel
266# @DESCRIPTION:
267# This function verifies that the current kernel is configured (it checks against the existence of .config)
268# otherwise it dies.
269require_configured_kernel() {
270 if ! linux_config_src_exists; then
271 qeerror "Could not find a usable .config in the kernel source directory."
272 qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources."
273 qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that"
274 qeerror "it points to the necessary object directory so that it might find .config."
275 die "Kernel not configured; no .config found in ${KV_OUT_DIR}"
276 fi
277}
278
279# @FUNCTION: linux_chkconfig_present
280# @USAGE: option
281# @RETURN: true or false
282# @DESCRIPTION:
283# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config
284# If linux_config_exists returns false, the results of this are UNDEFINED. You
285# MUST call linux_config_exists first.
126linux_chkconfig_present() { 286linux_chkconfig_present() {
287 linux_config_qa_check linux_chkconfig_present
127local RESULT 288 local RESULT
289 local config
290 config="${KV_OUT_DIR}/.config"
291 [ ! -f "${config}" ] && config="/proc/config.gz"
128 RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)" 292 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
129 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1 293 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1
130} 294}
131 295
296# @FUNCTION: linux_chkconfig_module
297# @USAGE: option
298# @RETURN: true or false
299# @DESCRIPTION:
300# It checks that CONFIG_<option>=m is present in the current kernel .config
301# If linux_config_exists returns false, the results of this are UNDEFINED. You
302# MUST call linux_config_exists first.
132linux_chkconfig_module() { 303linux_chkconfig_module() {
304 linux_config_qa_check linux_chkconfig_module
133local RESULT 305 local RESULT
306 local config
307 config="${KV_OUT_DIR}/.config"
308 [ ! -f "${config}" ] && config="/proc/config.gz"
134 RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)" 309 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
135 [ "${RESULT}" = "m" ] && return 0 || return 1 310 [ "${RESULT}" = "m" ] && return 0 || return 1
136} 311}
137 312
313# @FUNCTION: linux_chkconfig_builtin
314# @USAGE: option
315# @RETURN: true or false
316# @DESCRIPTION:
317# It checks that CONFIG_<option>=y is present in the current kernel .config
318# If linux_config_exists returns false, the results of this are UNDEFINED. You
319# MUST call linux_config_exists first.
138linux_chkconfig_builtin() { 320linux_chkconfig_builtin() {
321 linux_config_qa_check linux_chkconfig_builtin
139local RESULT 322 local RESULT
323 local config
324 config="${KV_OUT_DIR}/.config"
325 [ ! -f "${config}" ] && config="/proc/config.gz"
140 RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)" 326 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
141 [ "${RESULT}" = "y" ] && return 0 || return 1 327 [ "${RESULT}" = "y" ] && return 0 || return 1
142} 328}
143 329
330# @FUNCTION: linux_chkconfig_string
331# @USAGE: option
332# @RETURN: CONFIG_<option>
333# @DESCRIPTION:
334# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel).
335# If linux_config_exists returns false, the results of this are UNDEFINED. You
336# MUST call linux_config_exists first.
144linux_chkconfig_string() { 337linux_chkconfig_string() {
338 linux_config_qa_check linux_chkconfig_string
339 local config
340 config="${KV_OUT_DIR}/.config"
341 [ ! -f "${config}" ] && config="/proc/config.gz"
145 getfilevar "CONFIG_${1}" "${KV_OUT_DIR}/.config" 342 getfilevar_noexec "CONFIG_${1}" "${config}"
146} 343}
147 344
148# Versioning Functions 345# Versioning Functions
149# --------------------------------------- 346# ---------------------------------------
150 347
151# kernel_is returns true when the version is the same as the passed version 348# @FUNCTION: kernel_is
349# @USAGE: [-lt -gt -le -ge -eq] major_number [minor_number patch_number]
350# @RETURN: true or false
351# @DESCRIPTION:
352# It returns true when the current kernel version satisfies the comparison against the passed version.
353# -eq is the default comparison.
152# 354#
355# @CODE
153# For Example where KV = 2.6.9 356# For Example where KV = 2.6.9
154# kernel_is 2 4 returns false 357# kernel_is 2 4 returns false
155# kernel_is 2 returns true 358# kernel_is 2 returns true
156# kernel_is 2 6 returns true 359# kernel_is 2 6 returns true
157# kernel_is 2 6 8 returns false 360# kernel_is 2 6 8 returns false
158# kernel_is 2 6 9 returns true 361# kernel_is 2 6 9 returns true
159# 362# @CODE
363
160# got the jist yet? 364# got the jist yet?
161 365
162kernel_is() { 366kernel_is() {
163 # if we haven't determined the version yet, we need too. 367 # if we haven't determined the version yet, we need to.
164 get_version; 368 linux-info_get_any_version
369
165 local operator test value x=0 y=0 z=0 370 local operator testagainst value x=0 y=0 z=0
166 371
167 case ${1} in 372 case ${1} in
168 lt) operator="-lt"; shift;; 373 -lt|lt) operator="-lt"; shift;;
169 gt) operator="-gt"; shift;; 374 -gt|gt) operator="-gt"; shift;;
170 le) operator="-le"; shift;; 375 -le|le) operator="-le"; shift;;
171 ge) operator="-ge"; shift;; 376 -ge|ge) operator="-ge"; shift;;
172 eq) operator="-eq"; shift;; 377 -eq|eq) operator="-eq"; shift;;
173 *) operator="-eq";; 378 *) operator="-eq";;
174 esac 379 esac
175 380
176 for x in ${@}; do 381 for x in ${@}; do
177 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
178 value="${value}${x}" 383 value="${value}${x}"
179 z=$((${z} + 1)) 384 z=$((${z} + 1))
180 385
181 case ${z} in 386 case ${z} in
182 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;
183 test="${test}${KV_MAJOR}";; 388 testagainst="${testagainst}${KV_MAJOR}";;
184 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;
185 test="${test}${KV_MINOR}";; 390 testagainst="${testagainst}${KV_MINOR}";;
186 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;
187 test="${test}${KV_PATCH}";; 392 testagainst="${testagainst}${KV_PATCH}";;
188 *) die "Error in kernel-2_kernel_is(): Too many parameters.";; 393 *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
189 esac 394 esac
190 done 395 done
191 396
192 [ ${test} ${operator} ${value} ] && return 0 || return 1 397 [ "${testagainst}" ${operator} "${value}" ] && return 0 || return 1
193} 398}
194 399
195get_localversion() { 400get_localversion() {
196 local lv_list i x 401 local lv_list i x
197 402
205 done 410 done
206 x=${x/ /} 411 x=${x/ /}
207 echo ${x} 412 echo ${x}
208} 413}
209 414
415# internal variable, so we know to only print the warning once
416get_version_warning_done=
417
418# @FUNCTION: get_version
419# @DESCRIPTION:
420# It gets the version of the kernel inside KERNEL_DIR and populates the KV_FULL variable
421# (if KV_FULL is already set it does nothing).
422#
423# The kernel version variables (KV_MAJOR, KV_MINOR, KV_PATCH, KV_EXTRA and KV_LOCAL) are also set.
424#
425# The KV_DIR is set using the KERNEL_DIR env var, the KV_DIR_OUT is set using a valid
426# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the
427# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build).
210get_version() { 428get_version() {
211 local kbuild_output 429 local kbuild_output
212 430
213 # no need to execute this twice assuming KV_FULL is populated. 431 # no need to execute this twice assuming KV_FULL is populated.
214 # we can force by unsetting KV_FULL 432 # we can force by unsetting KV_FULL
217 # if we dont know KV_FULL, then we need too. 435 # if we dont know KV_FULL, then we need too.
218 # make sure KV_DIR isnt set since we need to work it out via KERNEL_DIR 436 # make sure KV_DIR isnt set since we need to work it out via KERNEL_DIR
219 unset KV_DIR 437 unset KV_DIR
220 438
221 # KV_DIR will contain the full path to the sources directory we should use 439 # KV_DIR will contain the full path to the sources directory we should use
440 [ -z "${get_version_warning_done}" ] && \
222 qeinfo "Determining the location of the kernel source code" 441 qeinfo "Determining the location of the kernel source code"
223 [ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})" 442 [ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})"
224 [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}" 443 [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}"
225 444
226 if [ -z "${KV_DIR}" ] 445 if [ -z "${KV_DIR}" ]
227 then 446 then
447 if [ -z "${get_version_warning_done}" ]; then
448 get_version_warning_done=1
228 qeerror "Unable to find kernel sources at ${KERNEL_DIR}" 449 qeerror "Unable to find kernel sources at ${KERNEL_DIR}"
229 qeinfo "This package requires Linux sources." 450 #qeinfo "This package requires Linux sources."
230 if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then 451 if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then
231 qeinfo "Please make sure that ${KERNEL_DIR} points at your running kernel, " 452 qeinfo "Please make sure that ${KERNEL_DIR} points at your running kernel, "
232 qeinfo "(or the kernel you wish to build against)." 453 qeinfo "(or the kernel you wish to build against)."
233 qeinfo "Alternatively, set the KERNEL_DIR environment variable to the kernel sources location" 454 qeinfo "Alternatively, set the KERNEL_DIR environment variable to the kernel sources location"
234 else 455 else
235 qeinfo "Please ensure that the KERNEL_DIR environment variable points at full Linux sources of the kernel you wish to compile against." 456 qeinfo "Please ensure that the KERNEL_DIR environment variable points at full Linux sources of the kernel you wish to compile against."
457 fi
236 fi 458 fi
237 return 1 459 return 1
238 fi 460 fi
239 461
462 if [ -z "${get_version_warning_done}" ]; then
240 qeinfo "Found kernel source directory:" 463 qeinfo "Found kernel source directory:"
241 qeinfo " ${KV_DIR}" 464 qeinfo " ${KV_DIR}"
465 fi
242 466
243 if [ ! -s "${KV_DIR}/Makefile" ] 467 if [ ! -s "${KV_DIR}/Makefile" ]
244 then 468 then
469 if [ -z "${get_version_warning_done}" ]; then
470 get_version_warning_done=1
245 qeerror "Could not find a Makefile in the kernel source directory." 471 qeerror "Could not find a Makefile in the kernel source directory."
246 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources" 472 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources"
473 fi
247 return 1 474 return 1
248 fi 475 fi
249 476
250 # OK so now we know our sources directory, but they might be using 477 # OK so now we know our sources directory, but they might be using
251 # KBUILD_OUTPUT, and we need this for .config and localversions-* 478 # KBUILD_OUTPUT, and we need this for .config and localversions-*
252 # so we better find it eh? 479 # so we better find it eh?
253 # do we pass KBUILD_OUTPUT on the CLI? 480 # do we pass KBUILD_OUTPUT on the CLI?
254 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}" 481 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}"
255 482
483 # keep track of it
484 KERNEL_MAKEFILE="${KV_DIR}/Makefile"
485
486 # Check if the Makefile is valid for direct parsing.
487 # Check status results:
488 # - PASS, use 'getfilevar' to extract values
489 # - FAIL, use 'getfilevar_noexec' to extract values
490 # The check may fail if:
491 # - make is not present
492 # - corruption exists in the kernel makefile
493 local a='' b='' mkfunc='getfilevar'
494 a="$(getfilevar VERSION ${KERNEL_MAKEFILE})"
495 b="$(getfilevar_noexec VERSION ${KERNEL_MAKEFILE})"
496 [[ "${a}" != "${b}" ]] && mkfunc='getfilevar_noexec'
497
256 # And if we didn't pass it, we can take a nosey in the Makefile 498 # And if we didn't pass it, we can take a nosey in the Makefile
257 kbuild_output="$(getfilevar KBUILD_OUTPUT ${KV_DIR}/Makefile)" 499 kbuild_output="$(${mkfunc} KBUILD_OUTPUT ${KERNEL_MAKEFILE})"
258 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}" 500 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}"
259 501
260 # And contrary to existing functions I feel we shouldn't trust the 502 # And contrary to existing functions I feel we shouldn't trust the
261 # directory name to find version information as this seems insane. 503 # directory name to find version information as this seems insane.
262 # so we parse ${KV_DIR}/Makefile 504 # so we parse ${KERNEL_MAKEFILE}
263 KV_MAJOR="$(getfilevar VERSION ${KV_DIR}/Makefile)" 505 KV_MAJOR="$(${mkfunc} VERSION ${KERNEL_MAKEFILE})"
264 KV_MINOR="$(getfilevar PATCHLEVEL ${KV_DIR}/Makefile)" 506 KV_MINOR="$(${mkfunc} PATCHLEVEL ${KERNEL_MAKEFILE})"
265 KV_PATCH="$(getfilevar SUBLEVEL ${KV_DIR}/Makefile)" 507 KV_PATCH="$(${mkfunc} SUBLEVEL ${KERNEL_MAKEFILE})"
266 KV_EXTRA="$(getfilevar EXTRAVERSION ${KV_DIR}/Makefile)" 508 KV_EXTRA="$(${mkfunc} EXTRAVERSION ${KERNEL_MAKEFILE})"
267 509
268 if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ] 510 if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ]
269 then 511 then
512 if [ -z "${get_version_warning_done}" ]; then
513 get_version_warning_done=1
270 qeerror "Could not detect kernel version." 514 qeerror "Could not detect kernel version."
271 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources." 515 qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources."
516 fi
272 return 1 517 return 1
273 fi 518 fi
274 519
275 # and in newer versions we can also pull LOCALVERSION if it is set. 520 # and in newer versions we can also pull LOCALVERSION if it is set.
276 # but before we do this, we need to find if we use a different object directory. 521 # but before we do this, we need to find if we use a different object directory.
277 # This *WILL* break if the user is using localversions, but we assume it was 522 # This *WILL* break if the user is using localversions, but we assume it was
278 # caught before this if they are. 523 # caught before this if they are.
279 [ "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_EXTRA}" == "$(uname -r)" ] && \
280 OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_EXTRA}/build}" 524 OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build}"
281 525
282 [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})" 526 [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})"
283 [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}" 527 [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
284 if [ -n "${KV_OUT_DIR}" ]; 528 if [ -n "${KV_OUT_DIR}" ];
285 then 529 then
286 qeinfo "Found kernel object directory:" 530 qeinfo "Found kernel object directory:"
287 qeinfo " ${KV_OUT_DIR}" 531 qeinfo " ${KV_OUT_DIR}"
288 532
289 KV_LOCAL="$(get_localversion ${KV_OUT_DIR})" 533 KV_LOCAL="$(get_localversion ${KV_OUT_DIR})"
290 fi 534 fi
291 # and if we STILL haven't 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
292 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}" 536 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
293 537
294 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})" 538 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})"
539 if linux_config_src_exists; then
295 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)" 540 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)"
296 KV_LOCAL="${KV_LOCAL//\"/}" 541 KV_LOCAL="${KV_LOCAL//\"/}"
542
543 # For things like git that can append extra stuff:
544 [ -e ${KV_DIR}/scripts/setlocalversion ] &&
545 linux_chkconfig_builtin LOCALVERSION_AUTO &&
546 KV_LOCAL="${KV_LOCAL}$(sh ${KV_DIR}/scripts/setlocalversion ${KV_DIR})"
547 fi
297 548
298 # And we should set KV_FULL to the full expanded version 549 # And we should set KV_FULL to the full expanded version
299 KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}" 550 KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}"
300 551
301 qeinfo "Found sources for kernel version:" 552 qeinfo "Found sources for kernel version:"
302 qeinfo " ${KV_FULL}" 553 qeinfo " ${KV_FULL}"
303 554
304 if [ ! -s "${KV_OUT_DIR}/.config" ]
305 then
306 qeerror "Could not find a usable .config in the kernel source directory."
307 qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources."
308 qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that"
309 qeerror "it points to the necessary object directory so that it might find .config."
310 return 1
311 fi
312
313 return 0 555 return 0
314} 556}
315 557
558# @FUNCTION: get_running_version
559# @DESCRIPTION:
560# It gets the version of the current running kernel and the result is the same as get_version() if the
561# function can find the sources.
316get_running_version() { 562get_running_version() {
317 KV_FULL=$(uname -r) 563 KV_FULL=$(uname -r)
318 564
319 if [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile ]]; then 565 if [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile ]]; then
320 KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source) 566 KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source)
335 && KV_EXTRA="-${KV_FULL#*-}" 581 && KV_EXTRA="-${KV_FULL#*-}"
336 fi 582 fi
337 return 0 583 return 0
338} 584}
339 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
340 601
341# ebuild check functions 602# ebuild check functions
342# --------------------------------------- 603# ---------------------------------------
343 604
605# @FUNCTION: check_kernel_built
606# @DESCRIPTION:
607# This function verifies that the current kernel sources have been already prepared otherwise it dies.
344check_kernel_built() { 608check_kernel_built() {
345 # if we haven't determined the version yet, we need too. 609 # if we haven't determined the version yet, we need to
610 require_configured_kernel
346 get_version; 611 get_version
347 612
348 if [ ! -f "${KV_OUT_DIR}/include/linux/version.h" ] 613 if [ ! -f "${KV_OUT_DIR}/include/linux/version.h" ]
349 then 614 then
350 eerror "These sources have not yet been prepared." 615 eerror "These sources have not yet been prepared."
351 eerror "We cannot build against an unprepared tree." 616 eerror "We cannot build against an unprepared tree."
358 eerror "Then please try merging this module again." 623 eerror "Then please try merging this module again."
359 die "Kernel sources need compiling first" 624 die "Kernel sources need compiling first"
360 fi 625 fi
361} 626}
362 627
628# @FUNCTION: check_modules_supported
629# @DESCRIPTION:
630# This function verifies that the current kernel support modules (it checks CONFIG_MODULES=y) otherwise it dies.
363check_modules_supported() { 631check_modules_supported() {
364 # if we haven't determined the version yet, we need too. 632 # if we haven't determined the version yet, we need too.
633 require_configured_kernel
365 get_version; 634 get_version
366 635
367 if ! linux_chkconfig_builtin "MODULES" 636 if ! linux_chkconfig_builtin "MODULES"
368 then 637 then
369 eerror "These sources do not support loading external modules." 638 eerror "These sources do not support loading external modules."
370 eerror "to be able to use this module please enable \"Loadable modules support\"" 639 eerror "to be able to use this module please enable \"Loadable modules support\""
371 eerror "in your kernel, recompile and then try merging this module again." 640 eerror "in your kernel, recompile and then try merging this module again."
372 die "No support for external modules in ${KV_FULL} config" 641 die "No support for external modules in ${KV_FULL} config"
373 fi 642 fi
374} 643}
375 644
645# @FUNCTION: check_extra_config
646# @DESCRIPTION:
647# It checks the kernel config options specified by CONFIG_CHECK. It dies only when a required config option (i.e.
648# the prefix ~ is not used) doesn't satisfy the directive.
376check_extra_config() { 649check_extra_config() {
377 local config negate error local_error i n
378 local temp_config die reworkmodulenames 650 local config negate die error reworkmodulenames
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}"
379 656
380 # if we haven't determined the version yet, we need too. 657 # if we haven't determined the version yet, we need to
381 get_version; 658 linux-info_get_any_version
382 659
660 # Determine if we really need a .config. The only time when we don't need
661 # one is when all of the CONFIG_CHECK options are prefixed with "~".
662 for config in ${CONFIG_CHECK}
663 do
664 if [[ "${config:0:1}" != "~" ]]; then
665 config_required=1
666 break
667 fi
668 done
669
670 if [[ ${config_required} == 0 ]]; then
671 # In the case where we don't require a .config, we can now bail out
672 # if the user has no .config as there is nothing to do. Otherwise
673 # code later will cause a failure due to missing .config.
674 if ! linux_config_exists; then
675 ewarn "Unable to check for the following kernel config options due"
676 ewarn "to absence of any configured kernel sources or compiled"
677 ewarn "config:"
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
685 ewarn " - ${config#\~}${msg:+ - }${msg}"
686 done
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}"
689 return 0
690 fi
691 else
692 require_configured_kernel
693 fi
694
383 einfo "Checking for suitable kernel configuration options:" 695 einfo "Checking for suitable kernel configuration options..."
696
384 for config in ${CONFIG_CHECK} 697 for config in ${CONFIG_CHECK}
385 do 698 do
386 # if we specify any fatal, ensure we honor them 699 # if we specify any fatal, ensure we honor them
387 die=1 700 die=1
388 error=0 701 error=0
389 negate=0 702 negate=0
390 reworkmodulenames=0 703 reworkmodulenames=0
391 704
392 if [[ -z ${config//\!*} ]]; then 705 if [[ ${config:0:1} == "~" ]]; then
393 negate=1 706 die=0
394 config=${config:1} 707 config=${config:1}
395 fi 708 elif [[ ${config:0:1} == "@" ]]; then
396 if [[ -z ${config/\@*} ]]; then
397 die=2 709 die=0
398 reworkmodulenames=1 710 reworkmodulenames=1
399 config=${config:1} 711 config=${config:1}
400 fi 712 fi
401 if [[ -z ${config/\~*} ]]; then 713 if [[ ${config:0:1} == "!" ]]; then
402 die=0 714 negate=1
403 config=${config:1} 715 config=${config:1}
404 fi 716 fi
405 717
406 if [[ ${negate} == 1 ]]; then 718 if [[ ${negate} == 1 ]]; then
407 linux_chkconfig_present ${config} && error=2 719 linux_chkconfig_present ${config} && error=2
408 elif [[ ${reworkmodulenames} == 1 ]]; then 720 elif [[ ${reworkmodulenames} == 1 ]]; then
409 temp_config="${config//*:}" 721 local temp_config="${config//*:}" i n
410 config="${config//:*}" 722 config="${config//:*}"
411 if linux_chkconfig_present ${config}; then 723 if linux_chkconfig_present ${config}; then
412 for i in ${MODULE_NAMES}; do 724 for i in ${MODULE_NAMES}; do
413 n="${i//${temp_config}}" 725 n="${i//${temp_config}}"
414 [[ -z ${n//(*} ]] && \ 726 [[ -z ${n//\(*} ]] && \
415 MODULE_IGNORE="${MODULE_IGNORE} ${temp_config}" 727 MODULE_IGNORE="${MODULE_IGNORE} ${temp_config}"
416 done 728 done
417 error=2 729 error=2
418 fi 730 fi
419 else 731 else
420 linux_chkconfig_present ${config} || error=1 732 linux_chkconfig_present ${config} || error=1
421 fi 733 fi
422 734
423 if [[ ${die} == 0 ]]; then
424 ebegin "CONFIG_${config}"
425 eend ${error}
426 else
427 if [[ ${error} > 0 ]]; then 735 if [[ ${error} > 0 ]]; then
736 local report_func="eerror" local_error
737 local_error="ERROR_${config}"
738 local_error="${!local_error}"
739
740 if [[ -z "${local_error}" ]]; then
741 # using old, deprecated format.
428 local_error="${config}_ERROR" 742 local_error="${config}_ERROR"
429 local_error="${!local_error}" 743 local_error="${!local_error}"
744 fi
745 if [[ ${die} == 0 && -z "${local_error}" ]]; then
746 #soft errors can be warnings
747 local_error="WARNING_${config}"
748 local_error="${!local_error}"
430 if [[ -z "${local_error}" ]]; then 749 if [[ -n "${local_error}" ]] ; then
431 [[ ${error} == 1 ]] \ 750 report_func="ewarn"
432 && local_error="is not set when it should be." \
433 || local_error="should not be set. But it is."
434 local_error="CONFIG_${config}:\t ${local_error}"
435 fi 751 fi
436 eerror " ${local_error}"
437 fi 752 fi
753
754 if [[ -z "${local_error}" ]]; then
755 [[ ${error} == 1 ]] \
756 && local_error="is not set when it should be." \
757 || local_error="should not be set. But it is."
758 local_error="CONFIG_${config}:\t ${local_error}"
759 fi
760 if [[ ${die} == 0 ]]; then
761 ${report_func} " ${local_error}"
762 soft_errors_count=$[soft_errors_count + 1]
763 else
764 ${report_func} " ${local_error}"
765 hard_errors_count=$[hard_errors_count + 1]
766 fi
438 fi 767 fi
439 done 768 done
440 769
441 if [[ ${error} > 0 ]]; then 770 if [[ ${hard_errors_count} > 0 ]]; then
442 eerror "Please check to make sure these options are set correctly." 771 eerror "Please check to make sure these options are set correctly."
443 eerror "Failure to do so may cause unexpected problems." 772 eerror "Failure to do so may cause unexpected problems."
444 if [[ ${die} == 1 ]]; then
445 eerror "Once you have satisfied these options, please try merging" 773 eerror "Once you have satisfied these options, please try merging"
446 eerror "this package again." 774 eerror "this package again."
775 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
447 die "Incorrect kernel configuration options" 776 die "Incorrect kernel configuration options"
777 elif [[ ${soft_errors_count} > 0 ]]; then
778 ewarn "Please check to make sure these options are set correctly."
779 ewarn "Failure to do so may cause unexpected problems."
780 else
781 eend 0
448 fi 782 fi
449 fi 783 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
450} 784}
451 785
452check_zlibinflate() { 786check_zlibinflate() {
453 # if we haven't determined the version yet, we need too. 787 # if we haven't determined the version yet, we need to
788 require_configured_kernel
454 get_version; 789 get_version
455 790
456 # although I restructured this code - I really really really dont support it! 791 # although I restructured this code - I really really really dont support it!
457 792
458 # bug #27882 - zlib routines are only linked into the kernel 793 # bug #27882 - zlib routines are only linked into the kernel
459 # if something compiled into the kernel calls them 794 # if something compiled into the kernel calls them
466 local DEFLATE 801 local DEFLATE
467 802
468 einfo "Determining the usability of ZLIB_INFLATE support in your kernel" 803 einfo "Determining the usability of ZLIB_INFLATE support in your kernel"
469 804
470 ebegin "checking ZLIB_INFLATE" 805 ebegin "checking ZLIB_INFLATE"
471 getfilevar_isbuiltin CONFIG_ZLIB_INFLATE ${KV_DIR}/.config 806 linux_chkconfig_builtin CONFIG_ZLIB_INFLATE
472 eend $? 807 eend $?
473 [ "$?" != 0 ] && die 808 [ "$?" != 0 ] && die
474 809
475 ebegin "checking ZLIB_DEFLATE" 810 ebegin "checking ZLIB_DEFLATE"
476 getfilevar_isbuiltin CONFIG_ZLIB_DEFLATE ${KV_DIR}/.config 811 linux_chkconfig_builtin CONFIG_ZLIB_DEFLATE
477 eend $? 812 eend $?
478 [ "$?" != 0 ] && die 813 [ "$?" != 0 ] && die
479 814
480 local LINENO_START 815 local LINENO_START
481 local LINENO_END 816 local LINENO_END
519} 854}
520 855
521################################ 856################################
522# Default pkg_setup 857# Default pkg_setup
523# Also used when inheriting linux-mod to force a get_version call 858# Also used when inheriting linux-mod to force a get_version call
524 859# @FUNCTION: linux-info_pkg_setup
860# @DESCRIPTION:
861# Force a get_version() call when inherited from linux-mod.eclass and then check if the kernel is configured
862# to support the options specified in CONFIG_CHECK (if not null)
525linux-info_pkg_setup() { 863linux-info_pkg_setup() {
526 get_version || die "Unable to calculate Linux Kernel version" 864 linux-info_get_any_version
865
866 if kernel_is 2 4; then
867 if [ "$( gcc-major-version )" -eq "4" ] ; then
868 echo
869 ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with"
870 ewarn "linux-2.4 (or modules building against a linux-2.4 kernel)!"
871 echo
872 ewarn "Either switch to another gcc-version (via gcc-config) or use a"
873 ewarn "newer kernel that supports gcc-4."
874 echo
875 ewarn "Also be aware that bugreports about gcc-4 not working"
876 ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
877 echo
878 epause 10
879 fi
880 fi
881
527 [ -n "${CONFIG_CHECK}" ] && check_extra_config; 882 [ -n "${CONFIG_CHECK}" ] && check_extra_config;
528} 883}

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20