diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-14 15:37:27 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-09-21 01:40:12 +0300 |
| commit | 0cb5bb53d6d1bac4b18637f8d45b3e7565b717ab (patch) | |
| tree | 823d20c12a39ee745a9924295d82fe1cc91f3f0f /meta-phosphor/classes | |
| parent | 2011bd1ed5c42fbb6abaaa7943c66551935dce79 (diff) | |
| download | openbmc-0cb5bb53d6d1bac4b18637f8d45b3e7565b717ab.tar.xz | |
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 <geissonator@yahoo.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/fit-image.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
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" |