From 53763a63ec8d2fd08e763a1ba708079893aaad0e Mon Sep 17 00:00:00 2001 From: Baikal Electronics Date: Wed, 28 Sep 2022 23:09:22 +0300 Subject: [PATCH] Fix task order for bootrom image preparation --- meta-baikal/recipes-core/images/core-image-minimal.bbappend | 6 ++++-- meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb | 4 ++-- meta-baikal/recipes-kernel/linux/linux-umulti.inc | 5 ++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/meta-baikal/recipes-core/images/core-image-minimal.bbappend b/meta-baikal/recipes-core/images/core-image-minimal.bbappend index 055e6dd..2bd4f27 100644 --- a/meta-baikal/recipes-core/images/core-image-minimal.bbappend +++ b/meta-baikal/recipes-core/images/core-image-minimal.bbappend @@ -33,7 +33,7 @@ check_size_fitness () { dd if=/dev/zero count=1 bs=$padding >> $1 } -baikal_build_bootrom () { +do_baikal_build_bootrom () { cd ${WORKDIR} cat ${BAIKAL_IMAGES}/${MACHINE}.u-boot.bin > ${MACHINE}.rom check_size_fitness ${MACHINE}.rom ${UBOOT_SECTION_END} ${MACHINE}.u-boot.bin @@ -46,8 +46,10 @@ baikal_build_bootrom () { cp -f ${MACHINE}.rom -t ${BAIKAL_IMAGES} } +addtask do_baikal_build_bootrom before do_populate_lic_deploy -IMAGE_POSTPROCESS_COMMAND += "baikal_deploy;baikal_build_bootrom;" +IMAGE_POSTPROCESS_COMMAND += "baikal_deploy;" +do_baikal_build_bootrom[depends] = "linux-baikal:do_deploy" python () { if d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-baikal": diff --git a/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb b/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb index 3d43ae8..50ebb39 100644 --- a/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb +++ b/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb @@ -43,5 +43,5 @@ baikal_deploy_vmlinux () { done } -do_deploy[postfuncs] += "baikal_deploy" -do_deploy[postfuncs] += "baikal_deploy_vmlinux" +do_deploy[prefuncs] += "baikal_deploy" +do_deploy[prefuncs] += "baikal_deploy_vmlinux" diff --git a/meta-baikal/recipes-kernel/linux/linux-umulti.inc b/meta-baikal/recipes-kernel/linux/linux-umulti.inc index d98f01e..a95f982 100644 --- a/meta-baikal/recipes-kernel/linux/linux-umulti.inc +++ b/meta-baikal/recipes-kernel/linux/linux-umulti.inc @@ -71,6 +71,5 @@ baikal_do_umulti () { do_assemble_fitimage_initramfs } -do_deploy[prefuncs] += "baikal_entrysymbol" - -do_deploy[prefuncs] += "baikal_do_umulti" +do_deploy[postfuncs] += "baikal_entrysymbol" +do_deploy[postfuncs] += "baikal_do_umulti" -- 2.39.5