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

Diff of /eclass/linux-mod.eclass

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

Revision 1.40 Revision 1.54
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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-mod.eclass,v 1.40 2005/07/05 11:37:03 johnm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.54 2005/10/22 17:35:39 johnm Exp $
4 4
5# Description: This eclass is used to interface with linux-info in such a way 5# Description: This eclass is used to interface with linux-info in such a way
6# to provide the functionality required and initial functions 6# to provide the functionality required and initial functions
7# required to install external modules against a kernel source 7# required to install external modules against a kernel source
8# tree. 8# tree.
12# 12#
13# Please direct your bugs to the current eclass maintainer :) 13# Please direct your bugs to the current eclass maintainer :)
14 14
15# A Couple of env vars are available to effect usage of this eclass 15# A Couple of env vars are available to effect usage of this eclass
16# These are as follows: 16# These are as follows:
17# 17#
18# Env Var Option Default Description 18# Env Var Option Default Description
19# KERNEL_DIR <string> /usr/src/linux The directory containing kernel 19# KERNEL_DIR <string> /usr/src/linux The directory containing kernel
20# the target kernel sources. 20# the target kernel sources.
21# ECONF_PARAMS <string> The parameters to pass to econf. 21# ECONF_PARAMS <string> The parameters to pass to econf.
22# If this is not set, then econf 22# If this is not set, then econf
23# isn't run. 23# isn't run.
24# BUILD_PARAMS <string> The parameters to pass to emake. 24# BUILD_PARAMS <string> The parameters to pass to emake.
25# BUILD_TARGETS <string> clean modules The build targets to pass to 25# BUILD_TARGETS <string> clean modules The build targets to pass to
26# make. 26# make.
27# MODULE_NAMES <string> This is the modules which are 27# MODULE_NAMES <string> This is the modules which are
28# to be built automatically using 28# to be built automatically using
29# the default pkg_compile/install. 29# the default pkg_compile/install.
30# They are explained properly 30# They are explained properly
31# below. It will only make 31# below. It will only make
32# BUILD_TARGETS once in any 32# BUILD_TARGETS once in any
33# directory. 33# directory.
34 34
35# MODULE_NAMES - Detailed Overview 35# MODULE_NAMES - Detailed Overview
36# 36#
37# The structure of each MODULE_NAMES entry is as follows: 37# The structure of each MODULE_NAMES entry is as follows:
38# modulename(libdir:srcdir:objdir) 38# modulename(libdir:srcdir:objdir)
39# for example: 39# for example:
40# MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})" 40# MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
41# 41#
42# what this would do is 42# what this would do is
43# cd ${S}/pci 43# cd ${S}/pci
44# make ${BUILD_PARAMS} ${BUILD_TARGETS} 44# make ${BUILD_PARAMS} ${BUILD_TARGETS}
45# cd ${S} 45# cd ${S}
46# insinto /lib/modules/${KV_FULL}/pci 46# insinto /lib/modules/${KV_FULL}/pci
78# the full path to any associated 78# the full path to any associated
79# documents for $modulename 79# documents for $modulename
80 80
81 81
82inherit linux-info 82inherit linux-info
83ECLASS=linux-mod
84INHERITED="$INHERITED $ECLASS"
85EXPORT_FUNCTIONS pkg_setup pkg_postinst src_install src_compile pkg_postrm 83EXPORT_FUNCTIONS pkg_setup pkg_postinst src_install src_compile pkg_postrm
86 84
87IUSE="${IUSE}" 85IUSE="" # don't put pcmcia here, rather in the ebuilds that actually support pcmcia
88SLOT="0" 86SLOT="0"
89DESCRIPTION="Based on the $ECLASS eclass" 87DESCRIPTION="Based on the $ECLASS eclass"
88RDEPEND="virtual/modutils
89 pcmcia? ( virtual/pcmcia )"
90DEPEND="virtual/linux-sources 90DEPEND="virtual/linux-sources
91 sys-apps/sed 91 sys-apps/sed
92 virtual/modutils
93 pcmcia? ( virtual/pcmcia )" 92 pcmcia? ( virtual/pcmcia )"
94 93
95# eclass utilities 94# eclass utilities
96# ---------------------------------- 95# ----------------------------------
96
97check_vermagic() {
98 local curr_gcc_ver=$(gcc -dumpversion)
99 local tmpfile old_chost old_gcc_ver result=0
100
101 tmpfile=`find ${KV_DIR}/ -iname "*.o.cmd" -exec grep usr/lib/gcc {} \; -quit`
102 tmpfile=${tmpfile//*usr/lib}
103 tmpfile=${tmpfile//\/include*}
104 old_chost=${tmpfile//*gcc\/}
105 old_chost=${old_chost//\/*}
106 old_gcc_ver=${tmpfile//*\/}
107
108 if [[ -z ${old_gcc_ver} || -z ${old_chost} ]]; then
109 ewarn ""
110 ewarn "Unable to detect what version of GCC was used to compile"
111 ewarn "the kernel. Build will continue, but you may experience problems."
112 elif [[ ${curr_gcc_ver} != ${old_gcc_ver} ]]; then
113 ewarn ""
114 ewarn "The version of GCC you are using (${curr_gcc_ver}) does"
115 ewarn "not match the version of GCC used to compile the"
116 ewarn "kernel (${old_gcc_ver})."
117 result=1
118 elif [[ ${CHOST} != ${old_chost} ]]; then
119 ewarn ""
120 ewarn "The current CHOST (${CHOST}) does not match the chost"
121 ewarn "used when compiling the kernel (${old_chost})."
122 result=1
123 fi
124
125 if [[ ${result} -gt 0 ]]; then
126 ewarn ""
127 ewarn "Build will not continue, because you will experience problems."
128 ewarn "To fix this either change the version of GCC you wish to use"
129 ewarn "to match the kernel, or recompile the kernel first."
130 die "GCC Version Mismatch."
131 fi
132}
97 133
98unpack_pcmcia_sources() { 134unpack_pcmcia_sources() {
99 # So while the two eclasses exist side-by-side and also the ebuilds inherit 135 # So while the two eclasses exist side-by-side and also the ebuilds inherit
100 # both we need to check for PCMCIA_SOURCE_DIR, and if we find it, then we 136 # both we need to check for PCMCIA_SOURCE_DIR, and if we find it, then we
101 # bail out and assume pcmcia.eclass is working on it. 137 # bail out and assume pcmcia.eclass is working on it.
102 [[ -n ${PCMCIA_SOURCE_DIR} ]] && return 1 138 [[ -n ${PCMCIA_SOURCE_DIR} ]] && return 1
103 139
104 if [[ -f "${1}" ]]; then 140 if [[ -f "${1}" ]]; then
105 PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/" 141 PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/"
106 142
107 ebegin "Decompressing pcmcia-cs sources" 143 ebegin "Decompressing pcmcia-cs sources"
108 mkdir -p ${PCMCIA_SOURCE_DIR} 144 mkdir -p ${PCMCIA_SOURCE_DIR}
109 tar -xjf ${1} -C ${PCMCIA_SOURCE_DIR} 145 tar -xjf ${1} -C ${PCMCIA_SOURCE_DIR}
110 eend $? 146 eend $?
111 147
141} 177}
142 178
143use_m() { 179use_m() {
144 # if we haven't determined the version yet, we need too. 180 # if we haven't determined the version yet, we need too.
145 get_version; 181 get_version;
146 182
147 # if the kernel version is greater than 2.6.6 then we should use 183 # if the kernel version is greater than 2.6.6 then we should use
148 # M= instead of SUBDIRS= 184 # M= instead of SUBDIRS=
149 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \ 185 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \
150 return 0 || return 1 186 return 0 || return 1
151} 187}
162} 198}
163 199
164update_depmod() { 200update_depmod() {
165 # if we haven't determined the version yet, we need too. 201 # if we haven't determined the version yet, we need too.
166 get_version; 202 get_version;
167 203
168 ebegin "Updating module dependencies for ${KV_FULL}" 204 ebegin "Updating module dependencies for ${KV_FULL}"
169 if [ -r ${KV_OUT_DIR}/System.map ] 205 if [ -r ${KV_OUT_DIR}/System.map ]
170 then 206 then
171 depmod -ae -F ${KV_OUT_DIR}/System.map -b ${ROOT} -r ${KV_FULL} 207 depmod -ae -F ${KV_OUT_DIR}/System.map -b ${ROOT} -r ${KV_FULL}
172 eend $? 208 eend $?
186 /sbin/modules-update 222 /sbin/modules-update
187 eend $? 223 eend $?
188 fi 224 fi
189} 225}
190 226
227move_old_moduledb() {
228 local OLDDIR=${ROOT}/usr/share/module-rebuild/
229 local NEWDIR=${ROOT}/var/lib/module-rebuild/
230
231 if [[ -f ${OLDDIR}/moduledb ]]; then
232 [[ ! -d ${NEWDIR} ]] && mkdir -p ${NEWDIR}
233 [[ ! -f ${NEWDIR}/moduledb ]] && \
234 mv ${OLDDIR}/moduledb ${NEWDIR}/moduledb
235 rm -f ${OLDDIR}/*
236 rmdir ${OLDDIR}
237 fi
238}
239
191update_moduledb() { 240update_moduledb() {
192 local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/ 241 local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
242 move_old_moduledb
193 243
194 if [[ ! -f ${MODULEDB_DIR}/moduledb ]]; then 244 if [[ ! -f ${MODULEDB_DIR}/moduledb ]]; then
195 [[ ! -d ${MODULEDB_DIR} ]] && mkdir -p ${MODULEDB_DIR} 245 [[ ! -d ${MODULEDB_DIR} ]] && mkdir -p ${MODULEDB_DIR}
196 touch ${MODULEDB_DIR}/moduledb 246 touch ${MODULEDB_DIR}/moduledb
197 fi 247 fi
198 if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then 248 if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
199 einfo "Adding module to moduledb." 249 einfo "Adding module to moduledb."
200 echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb 250 echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb
201 fi 251 fi
202} 252}
203 253
204remove_moduledb() { 254remove_moduledb() {
205 local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/ 255 local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
256 move_old_moduledb
206 257
207 if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then 258 if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
208 einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb." 259 einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb."
209 sed -ie "/.*${CATEGORY}\/${P}.*/d" ${MODULEDB_DIR}/moduledb 260 sed -ie "/.*${CATEGORY}\/${P}.*/d" ${MODULEDB_DIR}/moduledb
210 fi 261 fi
224 275
225generate_modulesd() { 276generate_modulesd() {
226 # This function will generate the neccessary modules.d file from the 277 # This function will generate the neccessary modules.d file from the
227 # information contained in the modules exported parms 278 # information contained in the modules exported parms
228 279
229 local currm_path currm t myIFS myVAR 280 local currm_path currm currm_t t myIFS myVAR
230 local module_docs module_enabled module_aliases \ 281 local module_docs module_enabled module_aliases \
231 module_additions module_examples module_modinfo module_opts 282 module_additions module_examples module_modinfo module_opts
232 283
233 for currm_path in ${@} 284 for currm_path in ${@}
234 do 285 do
235 currm=${currm_path//*\/} 286 currm=${currm_path//*\/}
236 currm=$(echo ${currm} | tr '[:lower:]' '[:upper:]') 287 currm=$(echo ${currm} | tr '[:lower:]' '[:upper:]')
288 currm_t=${currm}
289 while [[ -z ${currm_t//*-*} ]]; do
290 currm_t=${currm_t/-/_}
291 done
237 292
238 module_docs="$(eval echo \${MODULESD_${currm}_DOCS})" 293 module_docs="$(eval echo \${MODULESD_${currm_t}_DOCS})"
239 module_enabled="$(eval echo \${MODULESD_${currm}_ENABLED})" 294 module_enabled="$(eval echo \${MODULESD_${currm_t}_ENABLED})"
240 module_aliases="$(eval echo \${#MODULESD_${currm/-/_}_ALIASES[*]})" 295 module_aliases="$(eval echo \${#MODULESD_${currm_t}_ALIASES[*]})"
241 module_additions="$(eval echo \${#MODULESD_${currm/-/_}_ADDITIONS[*]})" 296 module_additions="$(eval echo \${#MODULESD_${currm_t}_ADDITIONS[*]})"
242 module_examples="$(eval echo \${#MODULESD_${currm/-/_}_EXAMPLES[*]})" 297 module_examples="$(eval echo \${#MODULESD_${currm_t}_EXAMPLES[*]})"
243 298
244 [[ ${module_aliases} -eq 0 ]] && unset module_aliases 299 [[ ${module_aliases} -eq 0 ]] && unset module_aliases
245 [[ ${module_additions} -eq 0 ]] && unset module_additions 300 [[ ${module_additions} -eq 0 ]] && unset module_additions
246 [[ ${module_examples} -eq 0 ]] && unset module_examples 301 [[ ${module_examples} -eq 0 ]] && unset module_examples
247 302
248 # If we specify we dont want it, then lets exit, otherwise we assume 303 # If we specify we dont want it, then lets exit, otherwise we assume
249 # that if its set, we do want it. 304 # that if its set, we do want it.
250 [[ ${module_enabled} == no ]] && return 0 305 [[ ${module_enabled} == no ]] && return 0
251 306
252 # unset any unwanted variables. 307 # unset any unwanted variables.
253 for t in ${!module_*} 308 for t in ${!module_*}
294 echo >> ${module_config} 349 echo >> ${module_config}
295 echo "# Configurable module parameters" >> ${module_config} 350 echo "# Configurable module parameters" >> ${module_config}
296 echo "# ------------------------------" >> ${module_config} 351 echo "# ------------------------------" >> ${module_config}
297 myIFS="${IFS}" 352 myIFS="${IFS}"
298 IFS="$(echo -en "\n\b")" 353 IFS="$(echo -en "\n\b")"
299 354
300 for t in ${module_modinfo} 355 for t in ${module_modinfo}
301 do 356 do
302 myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")" 357 myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")"
303 if [[ -n ${myVAR} ]] 358 if [[ -n ${myVAR} ]]
304 then 359 then
305 module_opts="${module_opts} ${t%%:*}:${myVAR}" 360 module_opts="${module_opts} ${t%%:*}:${myVAR}"
306 fi 361 fi
307 echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config} 362 echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config}
308 done 363 done
309 IFS="${myIFS}" 364 IFS="${myIFS}"
310 echo '' >> ${module_config} 365 echo '' >> ${module_config}
311 fi 366 fi
312 367
313 #----------------------------------------------------------------------- 368 #-----------------------------------------------------------------------
344 echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \ 399 echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \
345 >> ${module_config} 400 >> ${module_config}
346 done 401 done
347 echo '' >> ${module_config} 402 echo '' >> ${module_config}
348 fi 403 fi
349 404
350 #----------------------------------------------------------------------- 405 #-----------------------------------------------------------------------
351 406
352 # then we install it 407 # then we install it
353 insinto /etc/modules.d 408 insinto /etc/modules.d
354 newins ${module_config} ${currm_path//*\/} 409 newins ${module_config} ${currm_path//*\/}
358 done 413 done
359 eend 0 414 eend 0
360 return 0 415 return 0
361} 416}
362 417
363display_postinst() {
364 # if we haven't determined the version yet, we need too.
365 get_version;
366
367 local modulename moduledir sourcedir moduletemp file i
368
369 file=${ROOT}/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}
370 file=${file/\/\///}
371
372 for i in ${MODULE_IGNORE}
373 do
374 MODULE_NAMES=${MODULE_NAMES//${i}(*}
375 done
376
377 if [[ -n ${MODULE_NAMES} ]]
378 then
379 einfo "If you would like to load this module automatically upon boot"
380 einfo "please type the following as root:"
381 for i in ${MODULE_NAMES}
382 do
383 unset libdir srcdir objdir
384 for n in $(find_module_params ${i})
385 do
386 eval ${n/:*}=${n/*:/}
387 done
388 einfo " # echo \"${modulename}\" >> ${file}"
389 done
390 einfo
391 fi
392}
393
394find_module_params() { 418find_module_params() {
395 local matched_offset=0 matched_opts=0 test="${@}" temp_var result 419 local matched_offset=0 matched_opts=0 test="${@}" temp_var result
396 local i=0 y=0 z=0 420 local i=0 y=0 z=0
397 421
398 for((i=0; i<=${#test}; i++)) 422 for((i=0; i<=${#test}; i++))
399 do 423 do
400 case ${test:${i}:1} in 424 case ${test:${i}:1} in
401 \() matched_offset[0]=${i};; 425 \() matched_offset[0]=${i};;
402 \:) matched_opts=$((${matched_opts} + 1)); 426 \:) matched_opts=$((${matched_opts} + 1));
403 matched_offset[${matched_opts}]="${i}";; 427 matched_offset[${matched_opts}]="${i}";;
404 \)) matched_opts=$((${matched_opts} + 1)); 428 \)) matched_opts=$((${matched_opts} + 1));
405 matched_offset[${matched_opts}]="${i}";; 429 matched_offset[${matched_opts}]="${i}";;
406 esac 430 esac
407 done 431 done
408 432
409 for((i=0; i<=${matched_opts}; i++)) 433 for((i=0; i<=${matched_opts}; i++))
410 do 434 do
411 # i = offset were working on 435 # i = offset were working on
412 # y = last offset 436 # y = last offset
413 # z = current offset - last offset 437 # z = current offset - last offset
417 *) y=$((${matched_offset[$((${i} - 1))]} + 1)) 441 *) y=$((${matched_offset[$((${i} - 1))]} + 1))
418 z=$((${matched_offset[${i}]} - ${matched_offset[$((${i} - 1))]})); 442 z=$((${matched_offset[${i}]} - ${matched_offset[$((${i} - 1))]}));
419 z=$((${z} - 1)) 443 z=$((${z} - 1))
420 tempvar=${test:${y}:${z}};; 444 tempvar=${test:${y}:${z}};;
421 esac 445 esac
422 446
423 case ${i} in 447 case ${i} in
424 0) result="${result} modulename:${tempvar}";; 448 0) result="${result} modulename:${tempvar}";;
425 1) result="${result} libdir:${tempvar}";; 449 1) result="${result} libdir:${tempvar}";;
426 2) result="${result} srcdir:${tempvar}";; 450 2) result="${result} srcdir:${tempvar}";;
427 3) result="${result} objdir:${tempvar}";; 451 3) result="${result} objdir:${tempvar}";;
428 esac 452 esac
429 done 453 done
430 454
431 echo ${result} 455 echo ${result}
432} 456}
433 457
434# default ebuild functions 458# default ebuild functions
435# -------------------------------- 459# --------------------------------
437linux-mod_pkg_setup() { 461linux-mod_pkg_setup() {
438 linux-info_pkg_setup; 462 linux-info_pkg_setup;
439 check_kernel_built; 463 check_kernel_built;
440 check_modules_supported; 464 check_modules_supported;
441 set_kvobj; 465 set_kvobj;
466 check_vermagic;
442} 467}
443 468
444linux-mod_src_compile() { 469linux-mod_src_compile() {
445 local modulename libdir srcdir objdir i n myARCH="${ARCH}" 470 local modulename libdir srcdir objdir i n myARCH="${ARCH}"
446 unset ARCH 471 ARCH="$(tc-arch-kernel)"
447 472
448 BUILD_TARGETS=${BUILD_TARGETS:-clean module} 473 BUILD_TARGETS=${BUILD_TARGETS:-clean module}
449 474
450 for i in ${MODULE_IGNORE} 475 for i in ${MODULE_IGNORE}
451 do 476 do
452 MODULE_NAMES=${MODULE_NAMES//${i}(*} 477 MODULE_NAMES=${MODULE_NAMES//${i}(*}
453 done 478 done
454 479
460 eval ${n/:*}=${n/*:/} 485 eval ${n/:*}=${n/*:/}
461 done 486 done
462 libdir=${libdir:-misc} 487 libdir=${libdir:-misc}
463 srcdir=${srcdir:-${S}} 488 srcdir=${srcdir:-${S}}
464 objdir=${objdir:-${srcdir}} 489 objdir=${objdir:-${srcdir}}
465 490
466 if [ ! -f "${srcdir}/.built" ]; 491 if [ ! -f "${srcdir}/.built" ];
467 then 492 then
468 cd ${srcdir} 493 cd ${srcdir}
469 einfo "Preparing ${modulename} module" 494 einfo "Preparing ${modulename} module"
470 if [[ -n ${ECONF_PARAMS} ]] 495 if [[ -n ${ECONF_PARAMS} ]]
484 ARCH="${myARCH}" 509 ARCH="${myARCH}"
485} 510}
486 511
487linux-mod_src_install() { 512linux-mod_src_install() {
488 local modulename libdir srcdir objdir i n 513 local modulename libdir srcdir objdir i n
489 514
490 for i in ${MODULE_IGNORE} 515 for i in ${MODULE_IGNORE}
491 do 516 do
492 MODULE_NAMES=${MODULE_NAMES//${i}(*} 517 MODULE_NAMES=${MODULE_NAMES//${i}(*}
493 done 518 done
494 519
506 einfo "Installing ${modulename} module" 531 einfo "Installing ${modulename} module"
507 cd ${objdir} 532 cd ${objdir}
508 insinto ${ROOT}lib/modules/${KV_FULL}/${libdir} 533 insinto ${ROOT}lib/modules/${KV_FULL}/${libdir}
509 doins ${modulename}.${KV_OBJ} 534 doins ${modulename}.${KV_OBJ}
510 cd ${OLDPWD} 535 cd ${OLDPWD}
511 536
512 generate_modulesd ${objdir}/${modulename} 537 generate_modulesd ${objdir}/${modulename}
513 done 538 done
514} 539}
515 540
516linux-mod_pkg_postinst() { 541linux-mod_pkg_postinst() {
517 update_depmod; 542 update_depmod;
518 update_modules; 543 update_modules;
519 update_moduledb; 544 update_moduledb;
520 display_postinst;
521} 545}
522 546
523linux-mod_pkg_postrm() { 547linux-mod_pkg_postrm() {
524 remove_moduledb; 548 remove_moduledb;
525} 549}

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.54

  ViewVC Help
Powered by ViewVC 1.1.20