mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
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 <jonathan.haigh@arm.com>
This commit is contained in:
parent
6888a49ae8
commit
c7999e8c2f
|
@ -76,23 +76,18 @@ def make_dtb_boot_files(d):
|
||||||
imgtyp = d.getVar('KERNEL_IMAGETYPE')
|
imgtyp = d.getVar('KERNEL_IMAGETYPE')
|
||||||
|
|
||||||
def transform(dtb):
|
def transform(dtb):
|
||||||
|
base = os.path.basename(dtb)
|
||||||
if dtb.endswith('dtb'):
|
if dtb.endswith('dtb'):
|
||||||
# eg: whatever/bcm2708-rpi-b.dtb has:
|
# 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
|
# destination: bcm2708-rpi-b.dtb
|
||||||
base = os.path.basename(dtb)
|
return base
|
||||||
src = '{}-{}'.format(imgtyp, base)
|
|
||||||
dst = base
|
|
||||||
return '{};{}'.format(src, dst)
|
|
||||||
elif dtb.endswith('dtbo'):
|
elif dtb.endswith('dtbo'):
|
||||||
# overlay dtb:
|
# overlay dtb:
|
||||||
# eg: overlays/hifiberry-amp.dtbo has:
|
# eg: overlays/hifiberry-amp.dtbo has:
|
||||||
# DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo
|
# DEPLOYDIR file: hifiberry-amp.dtbo
|
||||||
# destination: overlays/hifiberry-amp.dtbo
|
# destination: overlays/hifiberry-amp.dtbo
|
||||||
base = os.path.basename(dtb)
|
return '{};{}'.format(base, dtb)
|
||||||
src = '{}-{}'.format(imgtyp, base)
|
|
||||||
dst = dtb
|
|
||||||
return '{};{}'.format(src, dtb)
|
|
||||||
|
|
||||||
return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
|
return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user