[OE-core] [morty][PATCH] kernel.bbclass: Fix symlink creation when using externalsrc
akuster808
akuster808 at gmail.com
Wed Jan 17 19:04:09 UTC 2018
On 01/11/2018 08:07 AM, Stefan Stanacar wrote:
> do_unpack is by default in SRCTREECOVEREDTASKS so this append can't run, since
> this tasks gets removed by externalsrc when it's enabled.
>
> However this was hidden because externalsrc does run do_fetch and do_unpack if
> there are type=kmeta or file:// entries in the SRC_URI value of the kernel recipe.
> (e.g linux-yocto).
>
> Make this a separate task so that it actually gets run for kernel recipes with
> no file:// or type=kmeta in SRC_URI.
Is this fixed in Master?
- armin
> Signed-off-by: Stefan Stanacar <sstncr at gmail.com>
> ---
> meta/classes/kernel.bbclass | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index f8318b8..3eaae03 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -102,7 +102,7 @@ inherit ${KERNEL_CLASSES}
> # the symlink.
> do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
> do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
> -base_do_unpack_append () {
> +python do_symlink_staging_dir () {
> s = d.getVar("S", True)
> if s[-1] == '/':
> # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail
> @@ -119,6 +119,8 @@ base_do_unpack_append () {
> shutil.move(s, kernsrc)
> os.symlink(kernsrc, s)
> }
> +addtask do_symlink_staging_dir after do_unpack before do_patch do_configure
> +
>
> inherit kernel-arch deploy
>
More information about the Openembedded-core
mailing list