From c7999e8c2f04385f34877aa9c549ed61c8bcf1a1 Mon Sep 17 00:00:00 2001 From: Jonathan Haigh Date: Tue, 17 Jul 2018 15:23:13 +0100 Subject: rpi-base.inc: update IMAGE_BOOT_FILES for change in oe-core [Issue #285] -- https://github.com/agherzan/meta-raspberrypi/issues/285 The openembedded-core commit 1860d9d3c62e2e94cd68a809385873ffd8270b6d changed the names of DTB files in the deploy directory - they are no longer prefixed with "${KERNEL_IMAGETYPE}-". Update make_dtb_boot_files (which generates entries in IMAGE_BOOT_FILES) to take this change into account. Signed-off-by: Jonathan Haigh --- conf/machine/include/rpi-base.inc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index b01c561..5eed55d 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -76,23 +76,18 @@ def make_dtb_boot_files(d): imgtyp = d.getVar('KERNEL_IMAGETYPE') def transform(dtb): + base = os.path.basename(dtb) if dtb.endswith('dtb'): # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb + # DEPLOYDIR file: bcm2708-rpi-b.dtb # destination: bcm2708-rpi-b.dtb - base = os.path.basename(dtb) - src = '{}-{}'.format(imgtyp, base) - dst = base - return '{};{}'.format(src, dst) + return base elif dtb.endswith('dtbo'): # overlay dtb: # eg: overlays/hifiberry-amp.dtbo has: - # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo + # DEPLOYDIR file: hifiberry-amp.dtbo # destination: overlays/hifiberry-amp.dtbo - base = os.path.basename(dtb) - src = '{}-{}'.format(imgtyp, base) - dst = dtb - return '{};{}'.format(src, dtb) + return '{};{}'.format(base, dtb) return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) -- cgit v1.2.3-54-g00ecf