summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 14:35:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:52 +0000
commit3f15d8a807edb02825e32c4d8c924b4465ca5098 (patch)
tree15091a4b06f91f76a73f266ee4248124c20973ed /meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
parent36bd248463291919f2a2fa343db88c99953c18c6 (diff)
downloadpoky-3f15d8a807edb02825e32c4d8c924b4465ca5098.tar.gz
kernel: Fix depmod for multilib
Using populate_sysroot for this data was a nice idea but flawed as it doesn't work in multilib builds. Instead we can use PKGDATA_DIR since this is consistent over multilib builds. It also turns out to be slightly neater code too. Hopefully this resolves the problem once and for all. (From OE-Core rev: 6cccae3ca54c1177a1d91d23c3e151d74e735ee9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb')
-rw-r--r--meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
index 83a382a2cd..44b7650e4e 100644
--- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
+++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
@@ -19,21 +19,21 @@ if [ "\$1" != "-a" -o "\$2" != "-b" ]; then
19 echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2 19 echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
20 exit 1 20 exit 1
21fi 21fi
22if [ ! -r ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/kernel-abiversion ]; then 22if [ ! -r ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion ]; then
23 echo "Unable to read: ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/kernel-abiversion" >&2 23 echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion" >&2
24else 24else
25 kernelabi=\$(cat ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/kernel-abiversion) 25 kernelabi=\$(cat ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion)
26 if [ "\$kernelabi" != "\$4" ]; then 26 if [ "\$kernelabi" != "\$4" ]; then
27 echo "Error: Kernel version \$4 does not match kernel-abiversion (\$kernelabi)" >&2 27 echo "Error: Kernel version \$4 does not match kernel-abiversion (\$kernelabi)" >&2
28 exit 1 28 exit 1
29 fi 29 fi
30fi 30fi
31 31
32if [ ! -r ${STAGING_DIR_TARHET}${datadir}/kernel-depmod/System.map-\$4 ]; then 32if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ]; then
33 echo "Unable to read: ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/System.map-\$4" >&2 33 echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2
34 exec env depmod "\$1" "\$2" "\$3" "\$4" 34 exec env depmod "\$1" "\$2" "\$3" "\$4"
35else 35else
36 exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_DIR_TARGET}${datadir}/kernel-depmod/System.map-\$4" "\$4" 36 exec env depmod "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4"
37fi 37fi
38EOF 38EOF
39 chmod +x ${D}${bindir_crossscripts}/depmodwrapper 39 chmod +x ${D}${bindir_crossscripts}/depmodwrapper