From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 5 Aug 2012 19:48:44 +0000 (+0000)
Subject: kernel.bbclass: Revert ${base_libdir} change
X-Git-Tag: yocto-4.0~36000
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=351bdc59f8af915ae203af7799eedc0ce42785f2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

kernel.bbclass: Revert ${base_libdir} change

The base_libdir change in 5b8a4798ea2ea7df66bb53c26448251ea7da3dd9
breaks the kernel build for 64 bit machines. Revert this part of the
change.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b434093561d..e2f2441802e 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -109,10 +109,10 @@ kernel_do_install() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-		rm -f "${D}${base_libdir}/modules/${KERNEL_VERSION}/modules.order"
-		rm -f "${D}${base_libdir}/modules/${KERNEL_VERSION}/modules.builtin"
-		rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/build"
-		rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/source"
+		rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
+		rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
+		rm "${D}/lib/modules/${KERNEL_VERSION}/build"
+		rm "${D}/lib/modules/${KERNEL_VERSION}/source"
 	else
 		bbnote "no modules to install"
 	fi