mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
41689e8fe2
The value of the RPI_KERNEL_VERSION can change between None and the kernel version which can result in taskhash mismatch errors while building images. The taskhash mismatch errors can be reproduced using: bitbake -c cleansstate virtual/kernel core-image-minimal && bitbake core-image-minimal The get_dts() and split_overlays() functions are modified so that the kernel version argument is optional. If the version is not supplied to these functions, they will fallback to the Python equivalent of the expression used for RPI_KERNEL_VERSION. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
45 lines
1.4 KiB
Plaintext
45 lines
1.4 KiB
Plaintext
inherit linux-kernel-base
|
|
|
|
def get_dts(d, ver=None):
|
|
import re
|
|
|
|
staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True)
|
|
dts = d.getVar("KERNEL_DEVICETREE", True)
|
|
|
|
# d.getVar() might return 'None' as a normal string
|
|
# leading to 'is None' check isn't enough.
|
|
# TODO: Investigate if this is a bug in bitbake
|
|
if ver is None or ver == "None":
|
|
''' if 'ver' isn't set try to grab the kernel version
|
|
from the kernel staging '''
|
|
ver = get_kernelversion_file(staging_dir)
|
|
|
|
if ver is not None:
|
|
min_ver = ver.split('.', 3)
|
|
else:
|
|
return dts
|
|
|
|
# Always turn off device tree support for kernel's < 3.18
|
|
try:
|
|
if int(min_ver[0]) >= 4:
|
|
if (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
|
|
dts = ' '.join([(re.sub(r'(.*)\.dtbo$', r'\1-overlay.dtb', x)) for x in dts.split()])
|
|
elif int(min_ver[1]) < 18:
|
|
dts = ""
|
|
except IndexError:
|
|
min_ver = None
|
|
|
|
return dts
|
|
|
|
|
|
def split_overlays(d, out, ver=None):
|
|
dts = get_dts(d, ver)
|
|
if out:
|
|
overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)
|
|
overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d)
|
|
else:
|
|
overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \
|
|
" " + oe.utils.str_filter('\S+\.dtbo$', dts, d)
|
|
|
|
return overlays
|