From 52489fefddc0d5b76a9a80061ec2c424cb15a4d7 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 18 Apr 2023 18:15:07 -0400 Subject: 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28655 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 --- .../meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc | 10 +++++----- 1 file 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 = " \ -- cgit 1.2.3-korg