From 77a1904b1833cd3b70b0dfd68671745eaacc9b19 Mon Sep 17 00:00:00 2001 From: George Liu Date: Fri, 28 May 2021 16:12:04 +0800 Subject: image_type_phosphor: fix signatures generation - We will hit a problem intermittently when we build image-bmc: We have 2 tasks running in parallel, the `do_generate_static` and `do_generate_static_alltar`. Both specify to use the same work directory, and both call to generate the signature files: do_generate_static_tar[dirs] = " ${S}/static" do_generate_static_alltar[dirs] = "${S}/static" Depending on timing, one task can remove the `image-full` file from the directory and the other task won't find it, and cause built failed. Error message: image-full: No such file or directory. - Resolves openbmc/openbmc#3797 Tested: built obmc-phopshor-image successfully. Temporarily solve openbmc/issues/3797 Signed-off-by: George Liu Change-Id: I7147f6c8db4f3a2a0c0c9bd54ac384ee8882b233 --- meta-phosphor/classes/image_types_phosphor.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-phosphor/classes/image_types_phosphor.bbclass') diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 1ec8706cb..c347fdba3 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -338,7 +338,6 @@ make_signatures() { cat $sort_signature_files > image-full openssl dgst -sha256 -sign ${SIGNING_KEY} -out image-full.sig image-full signature_files="${signature_files} image-full.sig" - rm -rf image-full fi } -- cgit v1.2.3 From 7f886a9f23c037fd57feeec585d9ba1f0061145a Mon Sep 17 00:00:00 2001 From: Troy Lee Date: Tue, 8 Jun 2021 17:50:49 +0800 Subject: phosphor: image_types_phosphor: 64MiB flash default layout Add an addition override for 64MiB static flash layout. The existing 32MiB layout are unchanged: partition: size: offset u-boot: 384 KiB (0 KiB) u-boot-env: 128 KiB (384 KiB) kernel/FIT: 4352 KiB (512 KiB) rootfs: 23808 KiB (4864 KiB) rwfs: 4MiB (28672 KiB) The existing 128MiB layout are unchanged: partition: size: offset u-boot: 896 KiB (0 KiB) u-boot-env: 128 KiB (896 KiB) kernel/FIT: 9 MiB (1 MiB) rootfs: 86 MiB (10 MiB) rwfs: 32MiB (96 MiB) The new layout for 64MiB is as follows: partition: size: offset u-boot: 896 KiB (0 KiB) u-boot-env: 128 KiB (896 KiB) kernel/FIT: 9 MiB (1 MiB) rootfs: 32 MiB (10 MiB) rwfs: 22 MiB (42 MiB) Signed-off-by: Troy Lee Change-Id: I001cf2e9bc30edc34e43c0c4503684050e2a764f --- meta-phosphor/classes/image_types_phosphor.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-phosphor/classes/image_types_phosphor.bbclass') diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index c347fdba3..21c451a7d 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -41,11 +41,14 @@ FLASH_NOR_UBI_OVERHEAD ?= "64" FLASH_UBOOT_SPL_SIZE ?= "64" FLASH_UBOOT_OFFSET ?= "0" FLASH_KERNEL_OFFSET ?= "512" +FLASH_KERNEL_OFFSET_flash-65536 ?= "1024" FLASH_KERNEL_OFFSET_flash-131072 ?= "1024" FLASH_UBI_OFFSET ?= "${FLASH_KERNEL_OFFSET}" FLASH_ROFS_OFFSET ?= "4864" +FLASH_ROFS_OFFSET_flash-65536 ?= "10240" FLASH_ROFS_OFFSET_flash-131072 ?= "10240" FLASH_RWFS_OFFSET ?= "28672" +FLASH_RWFS_OFFSET_flash-65536 ?= "43008" FLASH_RWFS_OFFSET_flash-131072 ?= "98304" # UBI volume sizes in KB unless otherwise noted. -- cgit v1.2.3