diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 14:35:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 15:36:52 +0000 |
commit | 3f15d8a807edb02825e32c4d8c924b4465ca5098 (patch) | |
tree | 15091a4b06f91f76a73f266ee4248124c20973ed /meta/lib/oe/rootfs.py | |
parent | 36bd248463291919f2a2fa343db88c99953c18c6 (diff) | |
download | poky-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/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 72d32f7899..420c0b9623 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -209,7 +209,7 @@ class Rootfs(object): | |||
209 | 'new', '-v']) | 209 | 'new', '-v']) |
210 | 210 | ||
211 | def _generate_kernel_module_deps(self): | 211 | def _generate_kernel_module_deps(self): |
212 | kernel_abi_ver_file = oe.path.join(self.d.getVar('STAGING_DIR_TARGET', True), self.d.getVar('datadir', True), "kernel-depmod", | 212 | kernel_abi_ver_file = oe.path.join(self.d.getVar('PKGDATA_DIR', True), "kernel-depmod", |
213 | 'kernel-abiversion') | 213 | 'kernel-abiversion') |
214 | if not os.path.exists(kernel_abi_ver_file): | 214 | if not os.path.exists(kernel_abi_ver_file): |
215 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) | 215 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) |