diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-02-11 09:03:26 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-02-11 09:03:26 +0100 |
| commit | b7c5e97b62025712740cc73d7649ba3e1aa2d4e2 (patch) | |
| tree | 5d29bfb11497b4bdc3d4e49dbb790faa19bf1b40 /classes | |
| parent | a340f93f676c6d426881c1298b78ad9e98930602 (diff) | |
| parent | d420f4df43fbc113158931f447562142dcf89e1f (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/module-base.bbclass | 2 | ||||
| -rw-r--r-- | classes/module_strip.bbclass | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass index c98baceeab..185803ebba 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -7,7 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}" export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" -KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" +KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') < "2.6.0"]}" KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}" KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}" KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}" diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass index 63e6569799..3316e20c80 100644 --- a/classes/module_strip.bbclass +++ b/classes/module_strip.bbclass @@ -3,7 +3,11 @@ do_strip_modules () { for p in ${PACKAGES}; do if test -e ${WORKDIR}/install/$p/lib/modules; then - modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`" + if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then + modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.ko`" + else + modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.o`" + fi if [ -n "$modules" ]; then for module in $modules ; do if ! [ -d "$module" ] ; then |