From 210cd32190b72bcad81520e5ad153bc489ea8741 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 5 Sep 2024 15:16:51 -0400 Subject: meta-agl-bsp: Kingfisher updates Updates to work with the new scarthgap-v5.9.4 branch in meta-rcar: - Remove ti-bt bbappend and other references, as using ti-bt has been dropped by upstream. - Remove si-tools and ti-bt-firmware bbappend tweaks that were to support usrmerge, as upstream seems to have incorporated them. - Replace IMAGE_NAME and IMAGE_LINK_NAME redefinitions with use of the new IMAGE_MACHINE_SUFFIX variable which achieves the same result. Bug-AGL: SPEC-5191 Change-Id: Ice07296a8560e07ce4b5705e6c2fa9f47896bfa0 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30248 Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3-adas/conf') 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 0c344a471..40d0ef0cb 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 @@ -6,8 +6,7 @@ # recipes. AGL_FEATURES:append:rcar-gen3 = " kingfisher" -IMAGE_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf${IMAGE_VERSION_SUFFIX}" -IMAGE_LINK_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf" +IMAGE_MACHINE_SUFFIX = "-${MACHINE}-kf" TOOLCHAIN_OUTPUTNAME:rcar-gen3 = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}" # Radio packages @@ -15,6 +14,5 @@ IMAGE_INSTALL:append:rcar-gen3 = " \ si-tools \ si-init \ linux-firmware-wl18xx \ - ti-bt \ ti-bt-firmware \ " -- cgit 1.2.3-korg