mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-04 16:10:04 +00:00
kernel.bbclass: do not mv/link sources when externalsrc enabled
If externalsrc is enabled the 'do_unpack' task is run if the recipe has some local source files. In the case of kernel recipe this caused the (externalsrc) source tree to be moved/symlinked. This patch prevents the behaviour, making sure the source tree is not moved around when externalsrc is enabled. Instead of moving the source tree, STAGING_KERNEL_DIR will be a symlink to it. [YOCTO #6658] (From OE-Core master rev: 8f6c564661a3801012eb2d9a98cdc99c91712367) (From OE-Core rev: ca55a01908126c45120fc18e68e78f8f49ecf0ce) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b213ada9a7
commit
e6fca31dc0
|
|
@ -51,9 +51,13 @@ base_do_unpack_append () {
|
|||
if s != kernsrc:
|
||||
bb.utils.mkdirhier(kernsrc)
|
||||
bb.utils.remove(kernsrc, recurse=True)
|
||||
import subprocess
|
||||
subprocess.call(d.expand("mv ${S} ${STAGING_KERNEL_DIR}"), shell=True)
|
||||
os.symlink(kernsrc, s)
|
||||
if d.getVar("EXTERNALSRC", True):
|
||||
# With EXTERNALSRC S will not be wiped so we can symlink to it
|
||||
os.symlink(s, kernsrc)
|
||||
else:
|
||||
import shutil
|
||||
shutil.move(s, kernsrc)
|
||||
os.symlink(kernsrc, s)
|
||||
}
|
||||
|
||||
inherit kernel-arch deploy
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user