MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpi-base.inc: update IMAGE_BOOT_FILES for change in oe-core

Browse Source 
[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 <jonathan.haigh@arm.com>
This commit is contained in:
Jonathan Haigh 2018-07-17 15:23:13 +01:00 committed by Andrei Gherzan
parent 6888a49ae8
commit c7999e8c2f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
conf/machine/include/rpi-base.inc
View File

@ -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])