public
/
meta-st-stm32mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

partitions & flashlayout: Prevent accident substring match 

There is a case that I bitbake my-image when INITRAMFS_IMAGE
is my-image-initramfs. In this case my-image is a substring
of my-image-initramfs, causing ST's flashlayout and partitions
classes accidentally skip adding their tasks.

This patch makes sure to use exact string match during variable
checks.

Signed-off-by: Bumsik Kim <k.bumsik@gmail.com>
This commit is contained in:
Bumsik Kim 2019-08-31 03:39:25 +09:00 committed by Christophe Priouzeau
parent 7d3d03fc48
commit 256eae27d9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/flashlayout-stm32mp.bbclass
View File

@ -135,7 +135,7 @@ python __anonymous () {
# Init partition list from PARTITIONS_IMAGE # Init partition list from PARTITIONS_IMAGE
image_partitions = (d.getVar('PARTITIONS_IMAGE') or "").split() image_partitions = (d.getVar('PARTITIONS_IMAGE') or "").split()
# We need to clearly identify ROOTFS build, not InitRAMFS one (if any) # We need to clearly identify ROOTFS build, not InitRAMFS one (if any)
if current_image_name not in image_partitions and current_image_name not in initramfs and current_image_name not in initrd: if current_image_name not in image_partitions and current_image_name != initramfs and current_image_name != initrd:
# We need to make sure to add all extra dependencies as 'depends' # We need to make sure to add all extra dependencies as 'depends'
# for image_complete task # for image_complete task
if d.getVar('FLASHLAYOUT_DEPEND_TASKS'): if d.getVar('FLASHLAYOUT_DEPEND_TASKS'):

2
classes/st-partitions-image.bbclass
View File

@ -32,7 +32,7 @@ python __anonymous () {
# We need to append partition images generation only to image # We need to append partition images generation only to image
# that are not one of the defined partitions and not the InitRAMFS image. # that are not one of the defined partitions and not the InitRAMFS image.
# Without this check we would create circular dependency # Without this check we would create circular dependency
if current_image_name not in image_partitions and current_image_name not in initramfs: if current_image_name not in image_partitions and current_image_name != initramfs:
for partition in image_partitions: for partition in image_partitions:
d.appendVarFlag('do_image_complete', 'depends', ' %s:do_image_complete' % partition) d.appendVarFlag('do_image_complete', 'depends', ' %s:do_image_complete' % partition)
} }