aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2009-02-10 22:24:26 -0500
committerTom Rini <trini@embeddedalley.com>2009-02-10 22:24:26 -0500
commitf9167aed6eedb9ce4ba347dc36c2d2b16a1e435c (patch)
tree54b9b903f9ea5fda75c265a9ab4d2fa1e3db308d /classes
parent25b281668e62d90c027978b13b53075534b81d0c (diff)
downloadopenembedded-f9167aed6eedb9ce4ba347dc36c2d2b16a1e435c.tar.gz
openembedded-f9167aed6eedb9ce4ba347dc36c2d2b16a1e435c.tar.bz2
openembedded-f9167aed6eedb9ce4ba347dc36c2d2b16a1e435c.zip
module_strip: When picking module suffix, use KERNEL_MAJOR_VERSION.
With the previously broken and unused KERNEL_OBJECT_SUFFIX, this actually evaluted to "" so we always did a find path -name *, which is why we need the -d test later on. Switch to testing for KERNEL_OBJECT_SUFFIX==2.6 and else'ing for 2.4 and doing .ko or .o. Leave KERNEL_OBJECT_SUFFIX in-tact for non-mainline users. This was easier than getting kernel.bbclass to evaluate KERNEL_OBJECT_SUFFIX either on its own or re-jigging module-base and module_strip, again for non-mainline users.
Diffstat (limited to 'classes')
-rw-r--r--classes/module_strip.bbclass6
1 files changed, 5 insertions, 1 deletions
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