summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-05 19:48:44 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-07 10:17:36 (GMT)
commitef9841286547806d1a732cc53b2ba6ca7df097b6 (patch)
treec32c0e0833c6ee9eeac4a342b45cbdc4b9c33d81
parente72a154603d0d094e3e4f8be7ea813ff3ac3143d (diff)
downloadpoky-ef9841286547806d1a732cc53b2ba6ca7df097b6.tar.gz
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. (From OE-Core rev: 351bdc59f8af915ae203af7799eedc0ce42785f2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b434093..e2f2441 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -109,10 +109,10 @@ kernel_do_install() {
109 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 109 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
110 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 110 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
111 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install 111 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
112 rm -f "${D}${base_libdir}/modules/${KERNEL_VERSION}/modules.order" 112 rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
113 rm -f "${D}${base_libdir}/modules/${KERNEL_VERSION}/modules.builtin" 113 rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
114 rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/build" 114 rm "${D}/lib/modules/${KERNEL_VERSION}/build"
115 rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/source" 115 rm "${D}/lib/modules/${KERNEL_VERSION}/source"
116 else 116 else
117 bbnote "no modules to install" 117 bbnote "no modules to install"
118 fi 118 fi