Message ID | 20230922222043.36032-1-denis@denix.org |
---|---|
State | Accepted, archived |
Commit | 5bbefd9602dd787866a80e4be6c1cb13d0ccdb0f |
Headers | show |
Series | [1/2] bitbake.conf: add MACHINE to SDK_NAME | expand |
On 9/22/2023 5:20 PM, Denys Dmytriyenko wrote: > Do the same here as Poky has done 5 years ago, adding MACHINE to > SDK_NAME: > > https://git.yoctoproject.org/meta-yocto/commit/?id=3614dd4aee9d19f1024edb6a36b2862c2d726c04 > > This avoids file conflicts in deploy/sdk/ when building multiple > machines (either manually or via multiconfig), where sdk/toolchain > installers, manifests and now SPDX archives will overlap otherwise. > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > Signed-off-by: Denys Dmytriyenko <denis@denix.org> Tested-by: Ryan Eatmon <reatmon@ti.com> > --- > meta/conf/bitbake.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 67577c8fe7..3fd089cebb 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -459,7 +459,7 @@ PKGDATA_DIR_SDK = "${TMPDIR}/pkgdata/${SDK_SYS}" > ################################################################## > > SDK_NAME_PREFIX ?= "oecore" > -SDK_NAME = "${SDK_NAME_PREFIX}-${IMAGE_BASENAME}-${SDK_ARCH}-${TUNE_PKGARCH}" > +SDK_NAME = "${SDK_NAME_PREFIX}-${IMAGE_BASENAME}-${SDK_ARCH}-${TUNE_PKGARCH}-${MACHINE}" > SDKPATH = "/usr/local/oe-sdk-hardcoded-buildpath" > SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" > # The path to default to installing the SDK to > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#188138): https://lists.openembedded.org/g/openembedded-core/message/188138 > Mute This Topic: https://lists.openembedded.org/mt/101531119/6551054 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 67577c8fe7..3fd089cebb 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -459,7 +459,7 @@ PKGDATA_DIR_SDK = "${TMPDIR}/pkgdata/${SDK_SYS}" ################################################################## SDK_NAME_PREFIX ?= "oecore" -SDK_NAME = "${SDK_NAME_PREFIX}-${IMAGE_BASENAME}-${SDK_ARCH}-${TUNE_PKGARCH}" +SDK_NAME = "${SDK_NAME_PREFIX}-${IMAGE_BASENAME}-${SDK_ARCH}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/usr/local/oe-sdk-hardcoded-buildpath" SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" # The path to default to installing the SDK to