From 41689e8fe2ee0ff83fc94fbb3a12ebcab648106b Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 6 Oct 2016 19:09:06 -0700 Subject: sdcard_image-rpi.bbclass: Remove redundant RPI_KERNEL_VERSION 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 Signed-off-by: Khem Raj --- classes/linux-raspberrypi-base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/linux-raspberrypi-base.bbclass') diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass index 930fc44..3a6e33d 100644 --- a/classes/linux-raspberrypi-base.bbclass +++ b/classes/linux-raspberrypi-base.bbclass @@ -1,6 +1,6 @@ inherit linux-kernel-base -def get_dts(d, ver): +def get_dts(d, ver=None): import re staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True) @@ -32,7 +32,7 @@ def get_dts(d, ver): return dts -def split_overlays(d, ver, out): +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) -- cgit v1.2.3-54-g00ecf