summaryrefslogtreecommitdiffstats
path: root/classes/linux-raspberrypi-base.bbclass
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2016-10-06 19:09:06 -0700
committerAndrei Gherzan <andrei@resin.io>2016-10-13 10:39:59 +0200
commit41689e8fe2ee0ff83fc94fbb3a12ebcab648106b (patch)
tree04bae1a5c3c3f4c101b2b064c807d7d654864087 /classes/linux-raspberrypi-base.bbclass
parent5697e77ec4b53c2f4618d20bfe0af16cd3dee604 (diff)
downloadmeta-raspberrypi-41689e8fe2ee0ff83fc94fbb3a12ebcab648106b.tar.gz
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 <net147@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'classes/linux-raspberrypi-base.bbclass')
-rw-r--r--classes/linux-raspberrypi-base.bbclass4
1 files changed, 2 insertions, 2 deletions
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 @@
1inherit linux-kernel-base 1inherit linux-kernel-base
2 2
3def get_dts(d, ver): 3def get_dts(d, ver=None):
4 import re 4 import re
5 5
6 staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True) 6 staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True)
@@ -32,7 +32,7 @@ def get_dts(d, ver):
32 return dts 32 return dts
33 33
34 34
35def split_overlays(d, ver, out): 35def split_overlays(d, out, ver=None):
36 dts = get_dts(d, ver) 36 dts = get_dts(d, ver)
37 if out: 37 if out:
38 overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) 38 overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)