summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-04-18 18:15:07 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-04-25 11:29:04 +0000
commit8c589ada3a9b37b0ecee88837b26e0b6e23fde22 (patch)
treec8dc76ff444b6e2d596545dd1ee68f2c244b9116
parenta0fd17fd5109a598b292bca73da8724bc535d1a4 (diff)
meta-agl-bsp: Add overrides to Kingfisher BSP changes
As was done in commit 32744858 for the plain h3ulcb/m3ulcb MACHINE configuration, add rcar-gen3 overrides to the Kingfisher variable tweaks to avoid unwanted side effects when building for other MACHINEs when using multiconfigs. This is needed to be able to build the KVM demo image for h3ulcb-kf. Bug-AGL: SPEC-4760 Change-Id: Ie52f0a4a586398875f88e558ef465162c9fdfec1 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28658 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
index 22fca5c67..b63a16d83 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
@@ -4,13 +4,13 @@
# Add a feature as a low-impact way to detect Kingfisher support in
# recipes.
-AGL_FEATURES:append = " kingfisher"
+AGL_FEATURES:append:rcar-gen3 = " kingfisher"
-PREFERRED_RPROVIDER_virtual/gpsd-conf ?= "gpsd-kingfisher-conf"
+PREFERRED_RPROVIDER_virtual/gpsd-conf:rcar-gen3 ?= "gpsd-kingfisher-conf"
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-kf${IMAGE_VERSION_SUFFIX}"
-IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}-kf"
-TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}"
+IMAGE_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf${IMAGE_VERSION_SUFFIX}"
+IMAGE_LINK_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf"
+TOOLCHAIN_OUTPUTNAME:rcar-gen3 = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}"
# Radio packages
IMAGE_INSTALL:append:rcar-gen3 = " \