From 0cb5bb53d6d1bac4b18637f8d45b3e7565b717ab Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 14 Sep 2023 08:37:27 -0400 Subject: fit-image.bbclass: support vendored dts files The 6.5 kernel moved dts files to sub-directories for many systems. Yocto already handles this and uses `KERNEL_DTBVENDORED` as a flag to indicate if the vendored path should be preserved or not. By default, the non-vendored paths are use (resulting in a `basename` call to strip off the vendor segment in many cases). Add support in the fit-image.bbclass for the same `KERNEL_DTBVENDORED` flag as an indicator if the truncated path should be used or not. The OpenBMC test bump for 6.5 can be found here: https://gerrit.openbmc.org/c/openbmc/openbmc/+/65884 Tested: - Confirmed yosemite4 machine builds with 6.5 kernel Change-Id: I95d20388b65b9a54396ee8a6ead963a94956db25 Signed-off-by: Andrew Geissler Signed-off-by: Patrick Williams --- meta-phosphor/classes/fit-image.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta-phosphor/classes') diff --git a/meta-phosphor/classes/fit-image.bbclass b/meta-phosphor/classes/fit-image.bbclass index d0c51831ae..8be3043547 100644 --- a/meta-phosphor/classes/fit-image.bbclass +++ b/meta-phosphor/classes/fit-image.bbclass @@ -541,6 +541,11 @@ fitimage_assemble() { continue fi + # For non-vendored DTBs, we need to strip off the vendor path. + if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then + DTB=`basename $DTB` + fi + DTB_PATH="${KERNEL_OUTPUT_DIR}/dts/$DTB" if [ ! -e "$DTB_PATH" ]; then DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB" -- cgit v1.2.3