/[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.39 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.39 2006/02/08 12:57:52 brix 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# 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"
44#
27# To simply warn about a missing option, prepend a '~'. 45# To simply warn about a missing option, prepend a '~'.
28# ERROR_CFG <string> The error message to display when the above check 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
29# fails. <CFG> should reference the appropriate option 58# fails. <CFG> should reference the appropriate option used in CONFIG_CHECK.
30# as above. ie: ERROR_MTRR="MTRR exists in the .config 59#
31# but shouldn't!!" 60# e.g.: ERROR_MTRR="MTRR exists in the .config but shouldn't!!"
32# KBUILD_OUTPUT <string> This is passed on commandline, or can be set from 61
33# 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
34# which is to be used as the kernel object directory. 65# which is to be used as the kernel object directory.
35 66
36# 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
37# set by hand. These are as follows: 68# set by hand. These are as follows:
38# 69
39# Env Var Option Description 70# @ECLASS-VARIABLE: KV_FULL
40# KV_FULL <string> The full kernel version. ie: 2.6.9-gentoo-johnm-r1 71# @DESCRIPTION:
41# 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
42# KV_MINOR <integer> The kernel minor version. ie: 6 73
43# KV_PATCH <integer> The kernel patch version. ie: 9 74# @ECLASS-VARIABLE: KV_MAJOR
44# KV_EXTRA <string> The kernel EXTRAVERSION. ie: -gentoo 75# @DESCRIPTION:
45# 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
46# 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
47# KERNEL_DIR is invalid. 97# KERNEL_DIR is invalid.
48# KV_OUT_DIR <string> The kernel object directory. will be KV_DIR unless 98
49# koutput is used. This should be used for referencing 99# @ECLASS-VARIABLE: KV_OUT_DIR
50# .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.
51 103
52# And to ensure all the weirdness with crosscompile 104# And to ensure all the weirdness with crosscompile
53inherit toolchain-funcs versionator 105inherit toolchain-funcs versionator
54 106
55EXPORT_FUNCTIONS pkg_setup 107EXPORT_FUNCTIONS pkg_setup
56 108
57DEPEND="virtual/linux-sources" 109DEPEND=""
58RDEPEND="" 110RDEPEND=""
59 111
60# Overwritable environment Var's 112# Overwritable environment Var's
61# --------------------------------------- 113# ---------------------------------------
62KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}" 114KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}"
67case ${ARCH} in 119case ${ARCH} in
68 ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; 120 ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
69 ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; 121 ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
70esac 122esac
71 123
72# These are legacy wrappers for toolchain-funcs. 124# @FUNCTION: set_arch_to_kernel
73# I dont like them here, but oh well. 125# @DESCRIPTION:
126# Set the env ARCH to match what the kernel expects.
74set_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.
75set_arch_to_portage() { export ARCH="$(tc-arch)"; } 131set_arch_to_portage() { export ARCH=$(tc-arch); }
76 132
77# qeinfo "Message" 133# qeinfo "Message"
78# ------------------- 134# -------------------
79# qeinfo is a quiet einfo call when EBUILD_PHASE 135# qeinfo is a quiet einfo call when EBUILD_PHASE
80# should not have visible output. 136# should not have visible output.
95qeerror() { qout eerror "${@}" ; } 151qeerror() { qout eerror "${@}" ; }
96 152
97# File Functions 153# File Functions
98# --------------------------------------- 154# ---------------------------------------
99 155
100# getfilevar accepts 2 vars as follows: 156# @FUNCTION: getfilevar
101# getfilevar <VARIABLE> <CONFIGFILE> 157# @USAGE: variable configfile
102 158# @RETURN: the value of the variable
159# @DESCRIPTION:
160# It detects the value of the variable defined in the file configfile. This is
161# done by including the configfile, and printing the variable with Make.
162# It WILL break if your makefile has missing dependencies!
103getfilevar() { 163getfilevar() {
104local ERROR workingdir basefname basedname myARCH="${ARCH}" 164local ERROR basefname basedname myARCH="${ARCH}"
105 ERROR=0 165 ERROR=0
106 166
107 [ -z "${1}" ] && ERROR=1 167 [ -z "${1}" ] && ERROR=1
108 [ ! -f "${2}" ] && ERROR=1 168 [ ! -f "${2}" ] && ERROR=1
109 169
111 then 171 then
112 echo -e "\n" 172 echo -e "\n"
113 eerror "getfilevar requires 2 variables, with the second a valid file." 173 eerror "getfilevar requires 2 variables, with the second a valid file."
114 eerror " getfilevar <VARIABLE> <CONFIGFILE>" 174 eerror " getfilevar <VARIABLE> <CONFIGFILE>"
115 else 175 else
116 workingdir="${PWD}"
117 basefname="$(basename ${2})" 176 basefname="$(basename ${2})"
118 basedname="$(dirname ${2})" 177 basedname="$(dirname ${2})"
119 unset ARCH 178 unset ARCH
120 179
121 cd "${basedname}" 180 echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
122 echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \ 181 make -C "${basedname}" M="${S}" ${BUILD_FIXES} -s -f - 2>/dev/null
123 make ${BUILD_FIXES} -s -f - e 2>/dev/null
124 cd "${workingdir}"
125 182
126 ARCH=${myARCH} 183 ARCH=${myARCH}
127 fi 184 fi
128} 185}
129 186
187# @FUNCTION: getfilevar_noexec
188# @USAGE: variable configfile
189# @RETURN: the value of the variable
190# @DESCRIPTION:
191# It detects the value of the variable defined in the file configfile.
192# This is done with sed matching an expression only. If the variable is defined,
193# you will run into problems. See getfilevar for those cases.
194getfilevar_noexec() {
195 local ERROR basefname basedname mycat myARCH="${ARCH}"
196 ERROR=0
197 mycat='cat'
198
199 [ -z "${1}" ] && ERROR=1
200 [ ! -f "${2}" ] && ERROR=1
201 [ "${2%.gz}" != "${2}" ] && mycat='zcat'
202
203 if [ "${ERROR}" = 1 ]
204 then
205 echo -e "\n"
206 eerror "getfilevar_noexec requires 2 variables, with the second a valid file."
207 eerror " getfilevar_noexec <VARIABLE> <CONFIGFILE>"
208 else
209 ${mycat} "${2}" | \
210 sed -n \
211 -e "/^[[:space:]]*${1}[[:space:]]*=[[:space:]]*\(.*\)\$/{
212 s,^[^=]*[[:space:]]*=[[:space:]]*,,g ;
213 s,[[:space:]]*\$,,g ;
214 p
215 }"
216 fi
217}
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}
234
235# @FUNCTION: linux_config_src_exists
236# @RETURN: true or false
237# @DESCRIPTION:
238# It returns true if .config exists in a build directory otherwise false
239linux_config_src_exists() {
240 export _LINUX_CONFIG_EXISTS_DONE=1
241 [ -s "${KV_OUT_DIR}/.config" ]
242}
243
244# @FUNCTION: linux_config_bin_exists
245# @RETURN: true or false
246# @DESCRIPTION:
247# It returns true if .config exists in /proc, otherwise false
248linux_config_bin_exists() {
249 export _LINUX_CONFIG_EXISTS_DONE=1
250 [ -s "/proc/config.gz" ]
251}
252
253# @FUNCTION: linux_config_exists
254# @RETURN: true or false
255# @DESCRIPTION:
256# It returns true if .config exists otherwise false
257#
258# This function MUST be checked before using any of the linux_chkconfig_*
259# functions.
260linux_config_exists() {
261 linux_config_src_exists || linux_config_bin_exists
262}
263
264# @FUNCTION: require_configured_kernel
265# @DESCRIPTION:
266# This function verifies that the current kernel is configured (it checks against the existence of .config)
267# otherwise it dies.
268require_configured_kernel() {
269 if ! linux_config_src_exists; then
270 qeerror "Could not find a usable .config in the kernel source directory."
271 qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources."
272 qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that"
273 qeerror "it points to the necessary object directory so that it might find .config."
274 die "Kernel not configured; no .config found in ${KV_OUT_DIR}"
275 fi
276}
277
278# @FUNCTION: linux_chkconfig_present
279# @USAGE: option
280# @RETURN: true or false
281# @DESCRIPTION:
282# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config
283# If linux_config_exists returns false, the results of this are UNDEFINED. You
284# MUST call linux_config_exists first.
130linux_chkconfig_present() { 285linux_chkconfig_present() {
286 linux_config_qa_check linux_chkconfig_present
131local RESULT 287 local RESULT
288 local config
289 config="${KV_OUT_DIR}/.config"
290 [ ! -f "${config}" ] && config="/proc/config.gz"
132 RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)" 291 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
133 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1 292 [ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1
134} 293}
135 294
295# @FUNCTION: linux_chkconfig_module
296# @USAGE: option
297# @RETURN: true or false
298# @DESCRIPTION:
299# It checks that CONFIG_<option>=m is present in the current kernel .config
300# If linux_config_exists returns false, the results of this are UNDEFINED. You
301# MUST call linux_config_exists first.
136linux_chkconfig_module() { 302linux_chkconfig_module() {
303 linux_config_qa_check linux_chkconfig_module
137local RESULT 304 local RESULT
305 local config
306 config="${KV_OUT_DIR}/.config"
307 [ ! -f "${config}" ] && config="/proc/config.gz"
138 RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)" 308 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
139 [ "${RESULT}" = "m" ] && return 0 || return 1 309 [ "${RESULT}" = "m" ] && return 0 || return 1
140} 310}
141 311
312# @FUNCTION: linux_chkconfig_builtin
313# @USAGE: option
314# @RETURN: true or false
315# @DESCRIPTION:
316# It checks that CONFIG_<option>=y is present in the current kernel .config
317# If linux_config_exists returns false, the results of this are UNDEFINED. You
318# MUST call linux_config_exists first.
142linux_chkconfig_builtin() { 319linux_chkconfig_builtin() {
320 linux_config_qa_check linux_chkconfig_builtin
143local RESULT 321 local RESULT
322 local config
323 config="${KV_OUT_DIR}/.config"
324 [ ! -f "${config}" ] && config="/proc/config.gz"
144 RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)" 325 RESULT="$(getfilevar_noexec CONFIG_${1} "${config}")"
145 [ "${RESULT}" = "y" ] && return 0 || return 1 326 [ "${RESULT}" = "y" ] && return 0 || return 1
146} 327}
147 328
329# @FUNCTION: linux_chkconfig_string
330# @USAGE: option
331# @RETURN: CONFIG_<option>
332# @DESCRIPTION:
333# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel).
334# If linux_config_exists returns false, the results of this are UNDEFINED. You
335# MUST call linux_config_exists first.
148linux_chkconfig_string() { 336linux_chkconfig_string() {
337 linux_config_qa_check linux_chkconfig_string
338 local config
339 config="${KV_OUT_DIR}/.config"
340 [ ! -f "${config}" ] && config="/proc/config.gz"
149 getfilevar "CONFIG_${1}" "${KV_OUT_DIR}/.config" 341 getfilevar_noexec "CONFIG_${1}" "${config}"
150} 342}
151 343
152# Versioning Functions 344# Versioning Functions
153# --------------------------------------- 345# ---------------------------------------
154 346
155# kernel_is returns true when the version is the same as the passed version 347# @FUNCTION: kernel_is
348# @USAGE: [-lt -gt -le -ge -eq] major_number [minor_number patch_number]
349# @RETURN: true or false
350# @DESCRIPTION:
351# It returns true when the current kernel version satisfies the comparison against the passed version.
352# -eq is the default comparison.
156# 353#
354# @CODE
157# For Example where KV = 2.6.9 355# For Example where KV = 2.6.9
158# kernel_is 2 4 returns false 356# kernel_is 2 4 returns false
159# kernel_is 2 returns true 357# kernel_is 2 returns true
160# kernel_is 2 6 returns true 358# kernel_is 2 6 returns true
161# kernel_is 2 6 8 returns false 359# kernel_is 2 6 8 returns false
162# kernel_is 2 6 9 returns true 360# kernel_is 2 6 9 returns true
163# 361# @CODE
362
164# got the jist yet? 363# got the jist yet?
165 364
166kernel_is() { 365kernel_is() {
167 # if we haven't determined the version yet, we need too. 366 # if we haven't determined the version yet, we need to.
168 get_version; 367 linux-info_get_any_version
368
169 local operator test value x=0 y=0 z=0 369 local operator testagainst value x=0 y=0 z=0
170 370
171 case ${1} in 371 case ${1} in
172 lt) operator="-lt"; shift;; 372 -lt|lt) operator="-lt"; shift;;
173 gt) operator="-gt"; shift;; 373 -gt|gt) operator="-gt"; shift;;
174 le) operator="-le"; shift;; 374 -le|le) operator="-le"; shift;;
175 ge) operator="-ge"; shift;; 375 -ge|ge) operator="-ge"; shift;;
176 eq) operator="-eq"; shift;; 376 -eq|eq) operator="-eq"; shift;;
177 *) operator="-eq";; 377 *) operator="-eq";;
178 esac 378 esac
179 379
180 for x in ${@}; do 380 for x in ${@}; do
181 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
182 value="${value}${x}" 382 value="${value}${x}"
183 z=$((${z} + 1)) 383 z=$((${z} + 1))
184 384
185 case ${z} in 385 case ${z} in
186 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;
187 test="${test}${KV_MAJOR}";; 387 testagainst="${testagainst}${KV_MAJOR}";;
188 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;
189 test="${test}${KV_MINOR}";; 389 testagainst="${testagainst}${KV_MINOR}";;
190 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;
191 test="${test}${KV_PATCH}";; 391 testagainst="${testagainst}${KV_PATCH}";;
192 *) die "Error in kernel-2_kernel_is(): Too many parameters.";; 392 *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
193 esac 393 esac
194 done 394 done
195 395
196 [ ${test} ${operator} ${value} ] && return 0 || return 1 396 [ "${testagainst}" ${operator} "${value}" ] && return 0 || return 1
197} 397}
198 398
199get_localversion() { 399get_localversion() {
200 local lv_list i x 400 local lv_list i x
201 401
209 done 409 done
210 x=${x/ /} 410 x=${x/ /}
211 echo ${x} 411 echo ${x}
212} 412}
213 413
414# internal variable, so we know to only print the warning once
415get_version_warning_done=
416
417# @FUNCTION: get_version
418# @DESCRIPTION:
419# It gets the version of the kernel inside KERNEL_DIR and populates the KV_FULL variable
420# (if KV_FULL is already set it does nothing).
421#
422# The kernel version variables (KV_MAJOR, KV_MINOR, KV_PATCH, KV_EXTRA and KV_LOCAL) are also set.
423#
424# The KV_DIR is set using the KERNEL_DIR env var, the KV_DIR_OUT is set using a valid
425# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the
426# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build).
214get_version() { 427get_version() {
215 local kbuild_output 428 local kbuild_output
216 429
217 # no need to execute this twice assuming KV_FULL is populated. 430 # no need to execute this twice assuming KV_FULL is populated.
218 # we can force by unsetting KV_FULL 431 # we can force by unsetting KV_FULL
221 # if we dont know KV_FULL, then we need too. 434 # if we dont know KV_FULL, then we need too.
222 # 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
223 unset KV_DIR 436 unset KV_DIR
224 437
225 # 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}" ] && \
226 qeinfo "Determining the location of the kernel source code" 440 qeinfo "Determining the location of the kernel source code"
227 [ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})" 441 [ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})"
228 [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}" 442 [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}"
229 443
230 if [ -z "${KV_DIR}" ] 444 if [ -z "${KV_DIR}" ]
231 then 445 then
446 if [ -z "${get_version_warning_done}" ]; then
447 get_version_warning_done=1
232 qeerror "Unable to find kernel sources at ${KERNEL_DIR}" 448 qeerror "Unable to find kernel sources at ${KERNEL_DIR}"
233 qeinfo "This package requires Linux sources." 449 #qeinfo "This package requires Linux sources."
234 if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then 450 if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then
235 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, "
236 qeinfo "(or the kernel you wish to build against)." 452 qeinfo "(or the kernel you wish to build against)."
237 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"
238 else 454 else
239 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
240 fi 457 fi
241 return 1 458 return 1
242 fi 459 fi
243 460
461 if [ -z "${get_version_warning_done}" ]; then
244 qeinfo "Found kernel source directory:" 462 qeinfo "Found kernel source directory:"
245 qeinfo " ${KV_DIR}" 463 qeinfo " ${KV_DIR}"
464 fi
246 465
247 if [ ! -s "${KV_DIR}/Makefile" ] 466 if [ ! -s "${KV_DIR}/Makefile" ]
248 then 467 then
468 if [ -z "${get_version_warning_done}" ]; then
469 get_version_warning_done=1
249 qeerror "Could not find a Makefile in the kernel source directory." 470 qeerror "Could not find a Makefile in the kernel source directory."
250 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
251 return 1 473 return 1
252 fi 474 fi
253 475
254 # 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
255 # KBUILD_OUTPUT, and we need this for .config and localversions-* 477 # KBUILD_OUTPUT, and we need this for .config and localversions-*
256 # so we better find it eh? 478 # so we better find it eh?
257 # do we pass KBUILD_OUTPUT on the CLI? 479 # do we pass KBUILD_OUTPUT on the CLI?
258 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}" 480 OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}"
259 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
260 # 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
261 kbuild_output="$(getfilevar KBUILD_OUTPUT ${KV_DIR}/Makefile)" 498 kbuild_output="$(${mkfunc} KBUILD_OUTPUT ${KERNEL_MAKEFILE})"
262 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}" 499 OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}"
263 500
264 # 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
265 # directory name to find version information as this seems insane. 502 # directory name to find version information as this seems insane.
266 # so we parse ${KV_DIR}/Makefile 503 # so we parse ${KERNEL_MAKEFILE}
267 KV_MAJOR="$(getfilevar VERSION ${KV_DIR}/Makefile)" 504 KV_MAJOR="$(${mkfunc} VERSION ${KERNEL_MAKEFILE})"
268 KV_MINOR="$(getfilevar PATCHLEVEL ${KV_DIR}/Makefile)" 505 KV_MINOR="$(${mkfunc} PATCHLEVEL ${KERNEL_MAKEFILE})"
269 KV_PATCH="$(getfilevar SUBLEVEL ${KV_DIR}/Makefile)" 506 KV_PATCH="$(${mkfunc} SUBLEVEL ${KERNEL_MAKEFILE})"
270 KV_EXTRA="$(getfilevar EXTRAVERSION ${KV_DIR}/Makefile)" 507 KV_EXTRA="$(${mkfunc} EXTRAVERSION ${KERNEL_MAKEFILE})"
271 508
272 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}" ]
273 then 510 then
511 if [ -z "${get_version_warning_done}" ]; then
512 get_version_warning_done=1
274 qeerror "Could not detect kernel version." 513 qeerror "Could not detect kernel version."
275 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
276 return 1 516 return 1
277 fi 517 fi
278 518
279 # 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.
280 # 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.
281 # This *WILL* break if the user is using localversions, but we assume it was 521 # This *WILL* break if the user is using localversions, but we assume it was
282 # caught before this if they are. 522 # caught before this if they are.
283 [ "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_EXTRA}" == "$(uname -r)" ] && \ 523 [ "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}" == "$(uname -r)" ] && \
284 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}"
285 525
286 [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})" 526 [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})"
287 [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}" 527 [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
288 if [ -n "${KV_OUT_DIR}" ]; 528 if [ -n "${KV_OUT_DIR}" ];
289 then 529 then
290 qeinfo "Found kernel object directory:" 530 qeinfo "Found kernel object directory:"
291 qeinfo " ${KV_OUT_DIR}" 531 qeinfo " ${KV_OUT_DIR}"
292 532
293 KV_LOCAL="$(get_localversion ${KV_OUT_DIR})" 533 KV_LOCAL="$(get_localversion ${KV_OUT_DIR})"
294 fi 534 fi
295 # 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
296 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}" 536 KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
297 537
298 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})" 538 KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})"
539 if linux_config_src_exists; then
299 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)" 540 KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)"
300 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
301 548
302 # And we should set KV_FULL to the full expanded version 549 # And we should set KV_FULL to the full expanded version
303 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}"
304 551
305 qeinfo "Found sources for kernel version:" 552 qeinfo "Found sources for kernel version:"
306 qeinfo " ${KV_FULL}" 553 qeinfo " ${KV_FULL}"
307 554
308 if [ ! -s "${KV_OUT_DIR}/.config" ]
309 then
310 qeerror "Could not find a usable .config in the kernel source directory."
311 qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources."
312 qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that"
313 qeerror "it points to the necessary object directory so that it might find .config."
314 return 1
315 fi
316
317 return 0 555 return 0
318} 556}
319 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.
320get_running_version() { 562get_running_version() {
321 KV_FULL=$(uname -r) 563 KV_FULL=$(uname -r)
322 564
323 if [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile ]]; then 565 if [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile ]]; then
324 KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source) 566 KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source)
339 && KV_EXTRA="-${KV_FULL#*-}" 581 && KV_EXTRA="-${KV_FULL#*-}"
340 fi 582 fi
341 return 0 583 return 0
342} 584}
343 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
344 601
345# ebuild check functions 602# ebuild check functions
346# --------------------------------------- 603# ---------------------------------------
347 604
605# @FUNCTION: check_kernel_built
606# @DESCRIPTION:
607# This function verifies that the current kernel sources have been already prepared otherwise it dies.
348check_kernel_built() { 608check_kernel_built() {
349 # 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
350 get_version; 611 get_version
351 612
352 if [ ! -f "${KV_OUT_DIR}/include/linux/version.h" ] 613 if [ ! -f "${KV_OUT_DIR}/include/linux/version.h" ]
353 then 614 then
354 eerror "These sources have not yet been prepared." 615 eerror "These sources have not yet been prepared."
355 eerror "We cannot build against an unprepared tree." 616 eerror "We cannot build against an unprepared tree."
362 eerror "Then please try merging this module again." 623 eerror "Then please try merging this module again."
363 die "Kernel sources need compiling first" 624 die "Kernel sources need compiling first"
364 fi 625 fi
365} 626}
366 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.
367check_modules_supported() { 631check_modules_supported() {
368 # 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
369 get_version; 634 get_version
370 635
371 if ! linux_chkconfig_builtin "MODULES" 636 if ! linux_chkconfig_builtin "MODULES"
372 then 637 then
373 eerror "These sources do not support loading external modules." 638 eerror "These sources do not support loading external modules."
374 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\""
375 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."
376 die "No support for external modules in ${KV_FULL} config" 641 die "No support for external modules in ${KV_FULL} config"
377 fi 642 fi
378} 643}
379 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.
380check_extra_config() { 649check_extra_config() {
381 local config negate error local_error i n
382 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}"
383 656
384 # if we haven't determined the version yet, we need too. 657 # if we haven't determined the version yet, we need to
385 get_version; 658 linux-info_get_any_version
386 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
387 einfo "Checking for suitable kernel configuration options:" 695 einfo "Checking for suitable kernel configuration options..."
696
388 for config in ${CONFIG_CHECK} 697 for config in ${CONFIG_CHECK}
389 do 698 do
390 # if we specify any fatal, ensure we honor them 699 # if we specify any fatal, ensure we honor them
391 die=1 700 die=1
392 error=0 701 error=0
393 negate=0 702 negate=0
394 reworkmodulenames=0 703 reworkmodulenames=0
395 704
396 if [[ -z ${config//\!*} ]]; then 705 if [[ ${config:0:1} == "~" ]]; then
397 negate=1 706 die=0
398 config=${config:1} 707 config=${config:1}
399 fi 708 elif [[ ${config:0:1} == "@" ]]; then
400 if [[ -z ${config/\@*} ]]; then
401 die=2 709 die=0
402 reworkmodulenames=1 710 reworkmodulenames=1
403 config=${config:1} 711 config=${config:1}
404 fi 712 fi
405 if [[ -z ${config/\~*} ]]; then 713 if [[ ${config:0:1} == "!" ]]; then
406 die=0 714 negate=1
407 config=${config:1} 715 config=${config:1}
408 fi 716 fi
409 717
410 if [[ ${negate} == 1 ]]; then 718 if [[ ${negate} == 1 ]]; then
411 linux_chkconfig_present ${config} && error=2 719 linux_chkconfig_present ${config} && error=2
412 elif [[ ${reworkmodulenames} == 1 ]]; then 720 elif [[ ${reworkmodulenames} == 1 ]]; then
413 temp_config="${config//*:}" 721 local temp_config="${config//*:}" i n
414 config="${config//:*}" 722 config="${config//:*}"
415 if linux_chkconfig_present ${config}; then 723 if linux_chkconfig_present ${config}; then
416 for i in ${MODULE_NAMES}; do 724 for i in ${MODULE_NAMES}; do
417 n="${i//${temp_config}}" 725 n="${i//${temp_config}}"
418 [[ -z ${n//\(*} ]] && \ 726 [[ -z ${n//\(*} ]] && \
422 fi 730 fi
423 else 731 else
424 linux_chkconfig_present ${config} || error=1 732 linux_chkconfig_present ${config} || error=1
425 fi 733 fi
426 734
427 if [[ ${die} == 0 ]]; then
428 ebegin "CONFIG_${config}"
429 eend ${error}
430 else
431 if [[ ${error} > 0 ]]; then 735 if [[ ${error} > 0 ]]; then
736 local report_func="eerror" local_error
432 local_error="ERROR_${config}" 737 local_error="ERROR_${config}"
738 local_error="${!local_error}"
739
740 if [[ -z "${local_error}" ]]; then
741 # using old, deprecated format.
742 local_error="${config}_ERROR"
433 local_error="${!local_error}" 743 local_error="${!local_error}"
434 744 fi
435 if [[ -z "${local_error}" ]]; then 745 if [[ ${die} == 0 && -z "${local_error}" ]]; then
436 # using old, deprecated format. 746 #soft errors can be warnings
437 local_error="${config}_ERROR" 747 local_error="WARNING_${config}"
438 local_error="${!local_error}" 748 local_error="${!local_error}"
749 if [[ -n "${local_error}" ]] ; then
750 report_func="ewarn"
439 fi 751 fi
440
441 if [[ -z "${local_error}" ]]; then
442 [[ ${error} == 1 ]] \
443 && local_error="is not set when it should be." \
444 || local_error="should not be set. But it is."
445 local_error="CONFIG_${config}:\t ${local_error}"
446 fi
447 eerror " ${local_error}"
448 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
449 fi 767 fi
450 done 768 done
451 769
452 if [[ ${error} > 0 ]]; then 770 if [[ ${hard_errors_count} > 0 ]]; then
453 eerror "Please check to make sure these options are set correctly." 771 eerror "Please check to make sure these options are set correctly."
454 eerror "Failure to do so may cause unexpected problems." 772 eerror "Failure to do so may cause unexpected problems."
455 if [[ ${die} == 1 ]]; then
456 eerror "Once you have satisfied these options, please try merging" 773 eerror "Once you have satisfied these options, please try merging"
457 eerror "this package again." 774 eerror "this package again."
775 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
458 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
459 fi 782 fi
460 fi 783 export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
461} 784}
462 785
463check_zlibinflate() { 786check_zlibinflate() {
464 # 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
465 get_version; 789 get_version
466 790
467 # 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!
468 792
469 # bug #27882 - zlib routines are only linked into the kernel 793 # bug #27882 - zlib routines are only linked into the kernel
470 # if something compiled into the kernel calls them 794 # if something compiled into the kernel calls them
477 local DEFLATE 801 local DEFLATE
478 802
479 einfo "Determining the usability of ZLIB_INFLATE support in your kernel" 803 einfo "Determining the usability of ZLIB_INFLATE support in your kernel"
480 804
481 ebegin "checking ZLIB_INFLATE" 805 ebegin "checking ZLIB_INFLATE"
482 getfilevar_isbuiltin CONFIG_ZLIB_INFLATE ${KV_DIR}/.config 806 linux_chkconfig_builtin CONFIG_ZLIB_INFLATE
483 eend $? 807 eend $?
484 [ "$?" != 0 ] && die 808 [ "$?" != 0 ] && die
485 809
486 ebegin "checking ZLIB_DEFLATE" 810 ebegin "checking ZLIB_DEFLATE"
487 getfilevar_isbuiltin CONFIG_ZLIB_DEFLATE ${KV_DIR}/.config 811 linux_chkconfig_builtin CONFIG_ZLIB_DEFLATE
488 eend $? 812 eend $?
489 [ "$?" != 0 ] && die 813 [ "$?" != 0 ] && die
490 814
491 local LINENO_START 815 local LINENO_START
492 local LINENO_END 816 local LINENO_END
530} 854}
531 855
532################################ 856################################
533# Default pkg_setup 857# Default pkg_setup
534# 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
535 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)
536linux-info_pkg_setup() { 863linux-info_pkg_setup() {
537 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
538 [ -n "${CONFIG_CHECK}" ] && check_extra_config; 882 [ -n "${CONFIG_CHECK}" ] && check_extra_config;
539} 883}

Legend:
Removed from v.1.39  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20