Re: [OE-core] [PATCH] kernel.bbclass: Fix symlink creation when using externalsrc
Ping? On Mon, Jan 29, 2018 at 4:38 PM, Stefan Stanacarwrote: > do_unpack is by default in SRCTREECOVEREDTASKS so this append can't run, > since > do_unpack gets removed by when externalsrc is enabled. > > This was hidden because externalsrc does actually run do_fetch and > do_unpack if > there are type=kmeta or file:// entries in the SRC_URI value of the kernel > recipe. > (which is the case for 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. > > Signed-off-by: Stefan Stanacar > --- > meta/classes/kernel.bbclass | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index 2f6eca3..6a8d6e8 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -125,7 +125,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") > if s[-1] == '/': > # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use > s as directory name and fail > @@ -142,6 +142,7 @@ 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 > > -- > 2.7.4 > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbclass: Fix symlink creation when using externalsrc
do_unpack is by default in SRCTREECOVEREDTASKS so this append can't run, since do_unpack gets removed by when externalsrc is enabled. This was hidden because externalsrc does actually run do_fetch and do_unpack if there are type=kmeta or file:// entries in the SRC_URI value of the kernel recipe. (which is the case for 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. Signed-off-by: Stefan Stanacar--- meta/classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2f6eca3..6a8d6e8 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -125,7 +125,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") if s[-1] == '/': # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail @@ -142,6 +142,7 @@ 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 -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbclass: Fix symlink creation when using externalsrc
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. Signed-off-by: Stefan Stanacar--- 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 f7b612f..6f0a117 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -125,7 +125,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") if s[-1] == '/': # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail @@ -142,6 +142,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 -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core