/[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.47 Revision 1.68
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.47 2005/07/07 12:09:06 brix Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.68 2006/10/16 14:10:46 genstef 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.
9# 9#
10# Maintainer: John Mylchreest <johnm@gentoo.org> 10# Maintainer: John Mylchreest <johnm@gentoo.org>, Stefan Schweizer <genstef@gentoo.org>
11# Copyright 2004 Gentoo Linux 11# Copyright 2004 Gentoo Linux
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
76# Each entry is a new line. 76# Each entry is a new line.
77# MODULES_${modulename}_DOCS This is a string list which contains 77# MODULES_${modulename}_DOCS This is a string list which contains
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# The order of these is important as both of linux-info and eutils contain
82# set_arch_to_kernel and set_arch_to_portage functions and the ones in eutils
83# are deprecated in favor of the ones in linux-info.
84# See http://bugs.gentoo.org/show_bug.cgi?id=127506
81 85
82inherit linux-info 86inherit eutils linux-info multilib
83EXPORT_FUNCTIONS pkg_setup pkg_postinst src_install src_compile pkg_postrm 87EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst src_install src_compile pkg_postrm
84 88
89IUSE="kernel_linux"
85SLOT="0" 90SLOT="0"
86DESCRIPTION="Based on the $ECLASS eclass" 91DESCRIPTION="Based on the $ECLASS eclass"
87RDEPEND="virtual/modutils 92RDEPEND="kernel_linux? ( virtual/modutils )"
88 pcmcia? ( virtual/pcmcia )"
89DEPEND="${RDEPEND} 93DEPEND="${RDEPEND}
90 virtual/linux-sources
91 sys-apps/sed" 94 sys-apps/sed"
92 95
93# eclass utilities 96# eclass utilities
94# ---------------------------------- 97# ----------------------------------
95 98
96unpack_pcmcia_sources() { 99check_vermagic() {
97 # So while the two eclasses exist side-by-side and also the ebuilds inherit 100 local curr_gcc_ver=$(gcc -dumpversion)
98 # both we need to check for PCMCIA_SOURCE_DIR, and if we find it, then we 101 local tmpfile old_chost old_gcc_ver result=0
99 # bail out and assume pcmcia.eclass is working on it.
100 [[ -n ${PCMCIA_SOURCE_DIR} ]] && return 1
101 102
102 if [[ -f "${1}" ]]; then 103 tmpfile=`find ${KV_DIR}/ -iname "*.o.cmd" -exec grep usr/lib/gcc {} \; -quit`
103 PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/" 104 tmpfile=${tmpfile//*usr/lib}
104 105 tmpfile=${tmpfile//\/include*}
105 ebegin "Decompressing pcmcia-cs sources" 106 old_chost=${tmpfile//*gcc\/}
106 mkdir -p ${PCMCIA_SOURCE_DIR} 107 old_chost=${old_chost//\/*}
107 tar -xjf ${1} -C ${PCMCIA_SOURCE_DIR} 108 old_gcc_ver=${tmpfile//*\/}
108 eend $?
109 109
110 if [[ -f ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version ]]; then 110 if [[ -z ${old_gcc_ver} || -z ${old_chost} ]]; then
111 PCMCIA_VERSION=$(cat ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version) 111 ewarn ""
112 einfo "Found pcmcia-cs-${PCMCIA_VERSION}" 112 ewarn "Unable to detect what version of GCC was used to compile"
113 ewarn "the kernel. Build will continue, but you may experience problems."
114 elif [[ ${curr_gcc_ver} != ${old_gcc_ver} ]]; then
115 ewarn ""
116 ewarn "The version of GCC you are using (${curr_gcc_ver}) does"
117 ewarn "not match the version of GCC used to compile the"
118 ewarn "kernel (${old_gcc_ver})."
119 result=1
120 elif [[ ${CHOST} != ${old_chost} ]]; then
121 ewarn ""
122 ewarn "The current CHOST (${CHOST}) does not match the chost"
123 ewarn "used when compiling the kernel (${old_chost})."
124 result=1
113 fi 125 fi
114 fi
115}
116 126
117# Dummy function for compatibility. 127 if [[ ${result} -gt 0 ]]; then
118pcmcia_configure() { return 0; } 128 ewarn ""
119 129 ewarn "Build will not continue, because you will experience problems."
120pcmcia_src_unpack() { 130 ewarn "To fix this either change the version of GCC you wish to use"
121 local pcmcia_tbz="${ROOT}/usr/src/pcmcia-cs/pcmcia-cs-build-env.tbz2" 131 ewarn "to match the kernel, or recompile the kernel first."
122 132 die "GCC Version Mismatch."
123 # if the kernel has pcmcia support built in, then we just ignore all this.
124 if linux_chkconfig_present PCMCIA; then
125 einfo "Kernel based PCMCIA support has been detected."
126 else
127 if kernel_is 2 4; then
128 unpack_pcmcia_sources ${pcmcia_tbz};
129 else
130 einfo "We have detected that you are running a 2.6 kernel"
131 einfo "but you are not using the built-in PCMCIA support."
132 einfo "We will assume you know what you are doing, but please"
133 einfo "consider using the built in PCMCIA support instead."
134 sleep 10
135
136 unpack_pcmcia_sources ${pcmcia_tbz};
137 fi
138 fi 133 fi
139} 134}
140 135
141use_m() { 136use_m() {
142 # if we haven't determined the version yet, we need too. 137 # if we haven't determined the version yet, we need too.
143 get_version; 138 get_version;
144 139
145 # if the kernel version is greater than 2.6.6 then we should use 140 # if the kernel version is greater than 2.6.6 then we should use
146 # M= instead of SUBDIRS= 141 # M= instead of SUBDIRS=
147 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \ 142 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \
148 return 0 || return 1 143 return 0 || return 1
149} 144}
160} 155}
161 156
162update_depmod() { 157update_depmod() {
163 # if we haven't determined the version yet, we need too. 158 # if we haven't determined the version yet, we need too.
164 get_version; 159 get_version;
165 160
166 ebegin "Updating module dependencies for ${KV_FULL}" 161 ebegin "Updating module dependencies for ${KV_FULL}"
167 if [ -r ${KV_OUT_DIR}/System.map ] 162 if [ -r ${KV_OUT_DIR}/System.map ]
168 then 163 then
169 depmod -ae -F ${KV_OUT_DIR}/System.map -b ${ROOT} -r ${KV_FULL} 164 depmod -ae -F ${KV_OUT_DIR}/System.map -b ${ROOT} -r ${KV_FULL}
170 eend $? 165 eend $?
187} 182}
188 183
189move_old_moduledb() { 184move_old_moduledb() {
190 local OLDDIR=${ROOT}/usr/share/module-rebuild/ 185 local OLDDIR=${ROOT}/usr/share/module-rebuild/
191 local NEWDIR=${ROOT}/var/lib/module-rebuild/ 186 local NEWDIR=${ROOT}/var/lib/module-rebuild/
192 187
193 if [[ -f ${OLDDIR}/moduledb ]]; then 188 if [[ -f ${OLDDIR}/moduledb ]]; then
194 [[ ! -d ${NEWDIR} ]] && mkdir -p ${NEWDIR} 189 [[ ! -d ${NEWDIR} ]] && mkdir -p ${NEWDIR}
195 [[ ! -f ${NEWDIR}/moduledb ]] && \ 190 [[ ! -f ${NEWDIR}/moduledb ]] && \
196 mv ${OLDDIR}/moduledb ${NEWDIR}/moduledb 191 mv ${OLDDIR}/moduledb ${NEWDIR}/moduledb
197 rm -f ${OLDDIR}/* 192 rm -f ${OLDDIR}/*
208 touch ${MODULEDB_DIR}/moduledb 203 touch ${MODULEDB_DIR}/moduledb
209 fi 204 fi
210 if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then 205 if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
211 einfo "Adding module to moduledb." 206 einfo "Adding module to moduledb."
212 echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb 207 echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb
213 fi 208 fi
214} 209}
215 210
216remove_moduledb() { 211remove_moduledb() {
217 local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/ 212 local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
218 move_old_moduledb 213 move_old_moduledb
219 214
220 if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then 215 if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
221 einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb." 216 einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb."
222 sed -ie "/.*${CATEGORY}\/${P}.*/d" ${MODULEDB_DIR}/moduledb 217 sed -ie "/.*${CATEGORY}\/${PN}-${PVR}.*/d" ${MODULEDB_DIR}/moduledb
223 fi 218 fi
224} 219}
225 220
226set_kvobj() { 221set_kvobj() {
227 if kernel_is 2 6 222 if kernel_is 2 6
233 # Do we really need to know this? 228 # Do we really need to know this?
234 # Lets silence it. 229 # Lets silence it.
235 # einfo "Using KV_OBJ=${KV_OBJ}" 230 # einfo "Using KV_OBJ=${KV_OBJ}"
236} 231}
237 232
233get-KERNEL_CC() {
234 local kernel_cc
235 if [ -n "${KERNEL_ABI}" ]; then
236 # In future, an arch might want to define CC_$ABI
237 #kernel_cc="$(get_abi_CC)"
238 #[ -z "${kernel_cc}" ] &&
239 kernel_cc="$(tc-getCC $(ABI=${KERNEL_ABI} get_abi_CHOST))"
240 else
241 kernel_cc=$(tc-getCC)
242 fi
243 echo "${kernel_cc}"
244}
245
238generate_modulesd() { 246generate_modulesd() {
239 # This function will generate the neccessary modules.d file from the 247 # This function will generate the neccessary modules.d file from the
240 # information contained in the modules exported parms 248 # information contained in the modules exported parms
241 249
242 local currm_path currm t myIFS myVAR 250 local currm_path currm currm_t t myIFS myVAR
243 local module_docs module_enabled module_aliases \ 251 local module_docs module_enabled module_aliases \
244 module_additions module_examples module_modinfo module_opts 252 module_additions module_examples module_modinfo module_opts
245 253
246 for currm_path in ${@} 254 for currm_path in ${@}
247 do 255 do
248 currm=${currm_path//*\/} 256 currm=${currm_path//*\/}
249 currm=$(echo ${currm} | tr '[:lower:]' '[:upper:]') 257 currm=$(echo ${currm} | tr '[:lower:]' '[:upper:]')
258 currm_t=${currm}
259 while [[ -z ${currm_t//*-*} ]]; do
260 currm_t=${currm_t/-/_}
261 done
250 262
251 module_docs="$(eval echo \${MODULESD_${currm}_DOCS})" 263 module_docs="$(eval echo \${MODULESD_${currm_t}_DOCS})"
252 module_enabled="$(eval echo \${MODULESD_${currm}_ENABLED})" 264 module_enabled="$(eval echo \${MODULESD_${currm_t}_ENABLED})"
253 module_aliases="$(eval echo \${#MODULESD_${currm/-/_}_ALIASES[*]})" 265 module_aliases="$(eval echo \${#MODULESD_${currm_t}_ALIASES[*]})"
254 module_additions="$(eval echo \${#MODULESD_${currm/-/_}_ADDITIONS[*]})" 266 module_additions="$(eval echo \${#MODULESD_${currm_t}_ADDITIONS[*]})"
255 module_examples="$(eval echo \${#MODULESD_${currm/-/_}_EXAMPLES[*]})" 267 module_examples="$(eval echo \${#MODULESD_${currm_t}_EXAMPLES[*]})"
256 268
257 [[ ${module_aliases} -eq 0 ]] && unset module_aliases 269 [[ ${module_aliases} -eq 0 ]] && unset module_aliases
258 [[ ${module_additions} -eq 0 ]] && unset module_additions 270 [[ ${module_additions} -eq 0 ]] && unset module_additions
259 [[ ${module_examples} -eq 0 ]] && unset module_examples 271 [[ ${module_examples} -eq 0 ]] && unset module_examples
260 272
261 # If we specify we dont want it, then lets exit, otherwise we assume 273 # If we specify we dont want it, then lets exit, otherwise we assume
262 # that if its set, we do want it. 274 # that if its set, we do want it.
263 [[ ${module_enabled} == no ]] && return 0 275 [[ ${module_enabled} == no ]] && return 0
264 276
265 # unset any unwanted variables. 277 # unset any unwanted variables.
266 for t in ${!module_*} 278 for t in ${!module_*}
307 echo >> ${module_config} 319 echo >> ${module_config}
308 echo "# Configurable module parameters" >> ${module_config} 320 echo "# Configurable module parameters" >> ${module_config}
309 echo "# ------------------------------" >> ${module_config} 321 echo "# ------------------------------" >> ${module_config}
310 myIFS="${IFS}" 322 myIFS="${IFS}"
311 IFS="$(echo -en "\n\b")" 323 IFS="$(echo -en "\n\b")"
312 324
313 for t in ${module_modinfo} 325 for t in ${module_modinfo}
314 do 326 do
315 myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")" 327 myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")"
316 if [[ -n ${myVAR} ]] 328 if [[ -n ${myVAR} ]]
317 then 329 then
318 module_opts="${module_opts} ${t%%:*}:${myVAR}" 330 module_opts="${module_opts} ${t%%:*}:${myVAR}"
319 fi 331 fi
320 echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config} 332 echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config}
321 done 333 done
322 IFS="${myIFS}" 334 IFS="${myIFS}"
323 echo '' >> ${module_config} 335 echo '' >> ${module_config}
324 fi 336 fi
325 337
326 #----------------------------------------------------------------------- 338 #-----------------------------------------------------------------------
357 echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \ 369 echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \
358 >> ${module_config} 370 >> ${module_config}
359 done 371 done
360 echo '' >> ${module_config} 372 echo '' >> ${module_config}
361 fi 373 fi
362 374
363 #----------------------------------------------------------------------- 375 #-----------------------------------------------------------------------
364 376
365 # then we install it 377 # then we install it
366 insinto /etc/modules.d 378 insinto /etc/modules.d
367 newins ${module_config} ${currm_path//*\/} 379 newins ${module_config} ${currm_path//*\/}
371 done 383 done
372 eend 0 384 eend 0
373 return 0 385 return 0
374} 386}
375 387
376display_postinst() {
377 # if we haven't determined the version yet, we need too.
378 get_version;
379
380 local modulename moduledir sourcedir moduletemp file i
381
382 file=${ROOT}/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}
383 file=${file/\/\///}
384
385 for i in ${MODULE_IGNORE}
386 do
387 MODULE_NAMES=${MODULE_NAMES//${i}(*}
388 done
389
390 if [[ -n ${MODULE_NAMES} ]]
391 then
392 einfo "If you would like to load this module automatically upon boot"
393 einfo "please type the following as root:"
394 for i in ${MODULE_NAMES}
395 do
396 unset libdir srcdir objdir
397 for n in $(find_module_params ${i})
398 do
399 eval ${n/:*}=${n/*:/}
400 done
401 einfo " # echo \"${modulename}\" >> ${file}"
402 done
403 einfo
404 fi
405}
406
407find_module_params() { 388find_module_params() {
408 local matched_offset=0 matched_opts=0 test="${@}" temp_var result 389 local matched_offset=0 matched_opts=0 test="${@}" temp_var result
409 local i=0 y=0 z=0 390 local i=0 y=0 z=0
410 391
411 for((i=0; i<=${#test}; i++)) 392 for((i=0; i<=${#test}; i++))
412 do 393 do
413 case ${test:${i}:1} in 394 case ${test:${i}:1} in
414 \() matched_offset[0]=${i};; 395 \() matched_offset[0]=${i};;
415 \:) matched_opts=$((${matched_opts} + 1)); 396 \:) matched_opts=$((${matched_opts} + 1));
416 matched_offset[${matched_opts}]="${i}";; 397 matched_offset[${matched_opts}]="${i}";;
417 \)) matched_opts=$((${matched_opts} + 1)); 398 \)) matched_opts=$((${matched_opts} + 1));
418 matched_offset[${matched_opts}]="${i}";; 399 matched_offset[${matched_opts}]="${i}";;
419 esac 400 esac
420 done 401 done
421 402
422 for((i=0; i<=${matched_opts}; i++)) 403 for((i=0; i<=${matched_opts}; i++))
423 do 404 do
424 # i = offset were working on 405 # i = offset were working on
425 # y = last offset 406 # y = last offset
426 # z = current offset - last offset 407 # z = current offset - last offset
430 *) y=$((${matched_offset[$((${i} - 1))]} + 1)) 411 *) y=$((${matched_offset[$((${i} - 1))]} + 1))
431 z=$((${matched_offset[${i}]} - ${matched_offset[$((${i} - 1))]})); 412 z=$((${matched_offset[${i}]} - ${matched_offset[$((${i} - 1))]}));
432 z=$((${z} - 1)) 413 z=$((${z} - 1))
433 tempvar=${test:${y}:${z}};; 414 tempvar=${test:${y}:${z}};;
434 esac 415 esac
435 416
436 case ${i} in 417 case ${i} in
437 0) result="${result} modulename:${tempvar}";; 418 0) result="${result} modulename:${tempvar}";;
438 1) result="${result} libdir:${tempvar}";; 419 1) result="${result} libdir:${tempvar}";;
439 2) result="${result} srcdir:${tempvar}";; 420 2) result="${result} srcdir:${tempvar}";;
440 3) result="${result} objdir:${tempvar}";; 421 3) result="${result} objdir:${tempvar}";;
441 esac 422 esac
442 done 423 done
443 424
444 echo ${result} 425 echo ${result}
445} 426}
446 427
447# default ebuild functions 428# default ebuild functions
448# -------------------------------- 429# --------------------------------
449 430
450linux-mod_pkg_setup() { 431linux-mod_pkg_setup() {
451 linux-info_pkg_setup; 432 linux-info_pkg_setup;
452 check_kernel_built; 433 check_kernel_built;
453 check_modules_supported; 434 strip_modulenames;
435 [[ -n ${MODULE_NAMES} ]] && check_modules_supported
454 set_kvobj; 436 set_kvobj;
437 # Commented out with permission from johnm until a fixed version for arches
438 # who intentionally use different kernel and userland compilers can be
439 # introduced - Jason Wever <weeve@gentoo.org>, 23 Oct 2005
440 #check_vermagic;
455} 441}
456 442
457linux-mod_src_compile() { 443strip_modulenames() {
458 local modulename libdir srcdir objdir i n myARCH="${ARCH}" 444 local i
459 unset ARCH
460
461 BUILD_TARGETS=${BUILD_TARGETS:-clean module}
462
463 for i in ${MODULE_IGNORE} 445 for i in ${MODULE_IGNORE}; do
464 do
465 MODULE_NAMES=${MODULE_NAMES//${i}(*} 446 MODULE_NAMES=${MODULE_NAMES//${i}(*}
466 done 447 done
448}
467 449
450linux-mod_src_compile() {
451 local modulename libdir srcdir objdir i n myARCH="${ARCH}" myABI="${ABI}"
452 ARCH="$(tc-arch-kernel)"
453 ABI="${KERNEL_ABI}"
454 CC_HOSTCC=$(tc-getBUILD_CC)
455 CC_CC=$(get-KERNEL_CC)
456
457 BUILD_TARGETS=${BUILD_TARGETS:-clean module}
458 strip_modulenames;
468 for i in ${MODULE_NAMES} 459 for i in ${MODULE_NAMES}
469 do 460 do
470 unset libdir srcdir objdir 461 unset libdir srcdir objdir
471 for n in $(find_module_params ${i}) 462 for n in $(find_module_params ${i})
472 do 463 do
473 eval ${n/:*}=${n/*:/} 464 eval ${n/:*}=${n/*:/}
474 done 465 done
475 libdir=${libdir:-misc} 466 libdir=${libdir:-misc}
476 srcdir=${srcdir:-${S}} 467 srcdir=${srcdir:-${S}}
477 objdir=${objdir:-${srcdir}} 468 objdir=${objdir:-${srcdir}}
478 469
479 if [ ! -f "${srcdir}/.built" ]; 470 if [ ! -f "${srcdir}/.built" ];
480 then 471 then
481 cd ${srcdir} 472 cd ${srcdir}
482 einfo "Preparing ${modulename} module" 473 einfo "Preparing ${modulename} module"
483 if [[ -n ${ECONF_PARAMS} ]] 474 if [[ -n ${ECONF_PARAMS} ]]
484 then 475 then
485 econf ${ECONF_PARAMS} || \ 476 econf ${ECONF_PARAMS} || \
486 die "Unable to run econf ${ECONF_PARAMS}" 477 die "Unable to run econf ${ECONF_PARAMS}"
487 fi 478 fi
488 479
489 emake ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS} \ 480 emake HOSTCC=${CC_HOSTCC} CC=${CC_CC} LDFLAGS="$(get_abi_LDFLAGS)" \
490 || die "Unable to make \
491 ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}." 481 ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS} \
482 || die "Unable to make ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}."
492 touch ${srcdir}/.built 483 touch ${srcdir}/.built
493 cd ${OLDPWD} 484 cd ${OLDPWD}
494 fi 485 fi
495 done 486 done
496 487
497 ARCH="${myARCH}" 488 ARCH="${myARCH}"
489 ABI="${myABI}"
498} 490}
499 491
500linux-mod_src_install() { 492linux-mod_src_install() {
501 local modulename libdir srcdir objdir i n 493 local modulename libdir srcdir objdir i n
502
503 for i in ${MODULE_IGNORE}
504 do
505 MODULE_NAMES=${MODULE_NAMES//${i}(*}
506 done
507 494
495 strip_modulenames;
508 for i in ${MODULE_NAMES} 496 for i in ${MODULE_NAMES}
509 do 497 do
510 unset libdir srcdir objdir 498 unset libdir srcdir objdir
511 for n in $(find_module_params ${i}) 499 for n in $(find_module_params ${i})
512 do 500 do
515 libdir=${libdir:-misc} 503 libdir=${libdir:-misc}
516 srcdir=${srcdir:-${S}} 504 srcdir=${srcdir:-${S}}
517 objdir=${objdir:-${srcdir}} 505 objdir=${objdir:-${srcdir}}
518 506
519 einfo "Installing ${modulename} module" 507 einfo "Installing ${modulename} module"
520 cd ${objdir} 508 cd ${objdir} || die "${objdir} does not exist"
521 insinto ${ROOT}lib/modules/${KV_FULL}/${libdir} 509 insinto /lib/modules/${KV_FULL}/${libdir}
522 doins ${modulename}.${KV_OBJ} 510 doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
523 cd ${OLDPWD} 511 cd ${OLDPWD}
524 512
525 generate_modulesd ${objdir}/${modulename} 513 generate_modulesd ${objdir}/${modulename}
526 done 514 done
527} 515}
528 516
517linux-mod_pkg_preinst() {
518 [ -d ${IMAGE}/lib/modules ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
519 [ -d ${IMAGE}/etc/modules.d ] && UPDATE_MODULES=true || UPDATE_MODULES=false
520 [ -d ${IMAGE}/lib/modules ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
521}
522
529linux-mod_pkg_postinst() { 523linux-mod_pkg_postinst() {
530 update_depmod; 524 ${UPDATE_DEPMOD} && update_depmod;
531 update_modules; 525 ${UPDATE_MODULES} && update_modules;
532 update_moduledb; 526 ${UPDATE_MODULEDB} && update_moduledb;
533 display_postinst;
534} 527}
535 528
536linux-mod_pkg_postrm() { 529linux-mod_pkg_postrm() {
537 remove_moduledb; 530 remove_moduledb;
538} 531}

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.68

  ViewVC Help
Powered by ViewVC 1.1.20