[OE-core] [PATCH] populate_sdk_base: fix support for changing SDKMACHINE settings
Joshua Lock
joshua.g.lock at linux.intel.com
Wed Sep 21 08:58:19 UTC 2016
On Tue, 2016-09-20 at 15:57 +0100, Joshua Lock wrote:
> Include SDKMACHINE in the tasks stamp information and the name of
> the sstate-inputdirs so that changing SDKMACHINE doesn't result in
> valid output of the task being deleted when SDKMACHINE is changed.
>
> Without this patch changing SDKMACHINE and building an SDK resulted
> in toolchain installers for other SDKMACHINE's being deleted from
> the deploy directoy.
>
> [YOCTO #10275]
>
> Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
> ---
> meta/classes/populate_sdk_base.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/populate_sdk_base.bbclass
> b/meta/classes/populate_sdk_base.bbclass
> index 6fe0b37..fc4ee8d 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -26,7 +26,7 @@ SDK_DIR = "${WORKDIR}/sdk"
> SDK_OUTPUT = "${SDK_DIR}/image"
> SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
>
> -SDKDEPLOYDIR = "${WORKDIR}/deploy-${PN}-populate-sdk"
> +SDKDEPLOYDIR = "${WORKDIR}/${SDKMACHINE}-deploy-${PN}-populate-sdk"
>
> B_task-populate-sdk = "${SDK_DIR}"
>
> @@ -125,7 +125,7 @@ SSTATE_SKIP_CREATION_task-populate-sdk = '1'
> do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}"
> do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}"
> do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}"
> -do_populate_sdk[stamp-extra-info] = "${MACHINE}"
> +do_populate_sdk[stamp-extra-info] = "${MACHINE} ${SDKMACHINE}"
This adds a space to the stamp file name. A v2 which removes the space
is being prepared.
Joshua
>
> fakeroot create_sdk_files() {
> cp ${COREBASE}/scripts/relocate_sdk.py
> ${SDK_OUTPUT}/${SDKPATH}/
> --
> 2.7.4
>
More information about the Openembedded-core
mailing list