.oniro-ci/build-generic.yaml

@@ -245,6 +245,7 @@
   variables:
     CI_ONIRO_BUILD_FLAVOUR: freertos
     CI_ONIRO_INSTANCE_SIZE: s3.large.2
+    CI_ONIRO_BB_LOCAL_CONF_plus_equals_CVE_CHECK_CREATE_MANIFEST: "0"
   script:
     - !reference [.bitbake-workspace, script]
     - time bitbake freertos-demo

docs/conf.py

@@ -25,7 +25,7 @@ project = 'Oniro Project Build System'
 copyright = '2022'
 author = 'Oniro Project'
 
-version = '2.0.0-alpha'
+version = '2.0.0-alpha2'
 release = version
 
 # -- General configuration ---------------------------------------------------

manifests/default.xml

@@ -24,18 +24,18 @@ SPDX-FileCopyrightText: Huawei Inc.
 	<remote name="seco" fetch="https://git.seco.com" />
 
 	<project name="bitbake" remote="openembedded" revision="494fcfcb7c4469915c67f544997104d81c417266" path="bitbake" />
-	<project name="openembedded-core" remote="openembedded" revision="4eb0b7468383a1d0314b3bfd43ea37c95de464d9" path="oe-core" />
-	<project name="meta-openembedded" remote="openembedded" revision="5357c7a40eaf8d1bcf7ff58edbba8e9527e40c7d" path="meta-openembedded" />
+	<project name="openembedded-core" remote="openembedded" revision="e63013cc38b82659658365da53b14952711d6701" path="oe-core" />
+	<project name="meta-openembedded" remote="openembedded" revision="fcc7d7eae82be4c180f2e8fa3db90a8ab3be07b7" path="meta-openembedded" />
 	<project name="aehs29/meta-freertos" remote="github" revision="98a6838261d36b8f79c5fbae1736492169727a1e" path="meta-freertos" />
-	<project name="meta-intel" remote="yocto" revision="fb23bc3e661685383edd3026e21ca25825c48bc4" path="meta-intel" />
+	<project name="meta-intel" remote="yocto" revision="8e472da759cd5a5bf2ece041d2796db56b1d5482" path="meta-intel" />
 	<project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" />
-	<project name="meta-freescale" remote="yocto" revision="6f27a6fb2511bc1ac206efe8196f6e73b33b1dce" path="meta-freescale" />
+	<project name="meta-freescale" remote="yocto" revision="92df6b76f38397b75ea76d588935b5b91b63c58c" path="meta-freescale" />
 	<project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="b82eaf8b0a2abe775c158b0a069b7bb7894ec8e6" path="meta-seco-imx" />
 	<project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" />
-	<project name="meta-security" remote="yocto" revision="93f2146211001ee3cf697d8428969cc3069ed6ba" path="meta-security" />
+	<project name="meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f" path="meta-security" />
 	<project name="rauc/meta-rauc" remote="github" revision="4429bd1f29677c9a7de032d53240fb4791a41e1f" path="meta-rauc" />
 	<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
-	<project name="meta-arm" remote="yocto" revision="b838d40efe06c839d58cf39b785175d0ba7518c6" path="meta-arm" />
+	<project name="meta-arm" remote="yocto" revision="93cf02a8213c5e2d2edafbcd47ff571941ad0bcc" path="meta-arm" />
 
 	<!--
 		All entries above are pinned to a specific revision and updated manually.

meta-oniro-core/conf/distro/include/oniro-wic.inc

@@ -13,7 +13,7 @@ BOOT_PARTITION_SIZE ?= "512M"
 # Root partitions
 # No label as default filesystem is squashfs.
 # The SECO B68 board pulls in almost half a Gigabyte worth of linux-firmware.
-ROOT_PARTITION_SIZE:seco-intel-b68 ?= "2G"
+ROOT_PARTITION_SIZE:seco-intel-b68 ?= "3G"
 ROOT_PARTITION_SIZE ?= "1G"
 ROOTA_PARTITION_SIZE = "${ROOT_PARTITION_SIZE}"
 ROOTB_PARTITION_SIZE = "${ROOT_PARTITION_SIZE}"

meta-oniro-core/recipes-core/ovmf/ovmf/0001-edk2-BaseTools-gcc12.patch

-# SPDX-FileCopyrightText: TianoCore and contributors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-From 7b005f344e533cd913c3ca05b266f9872df886d1 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Thu, 24 Mar 2022 20:04:34 +0800
-Subject: [PATCH] BaseTools: fix gcc12 warning
-
-GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free]
-  545 |     Error(NULL, 0, 4001, "Resource", "memory cannot be allocated  of %s", InFileHandle);
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-GenFfs.c:544:5: note: call to ?fclose? here
-  544 |     fclose (InFileHandle);
-      |     ^~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
-Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-Upstream-Status: Backport [commit 7b005f344e533cd913c3ca05b266f9872df886d1]
----
- BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
- BaseTools/Source/C/GenSec/GenSec.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
-index 949025c33325..d78d62ab3689 100644
---- a/BaseTools/Source/C/GenFfs/GenFfs.c
-+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
-@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
-   PeFileBuffer = (UINT8 *) malloc (PeFileSize);
-   if (PeFileBuffer == NULL) {
-     fclose (InFileHandle);
--    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated  of %s", InFileHandle);
-+    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
-     return EFI_OUT_OF_RESOURCES;
-   }
-   fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
-diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
-index d54a4f9e0a7d..b1d05367ec0b 100644
---- a/BaseTools/Source/C/GenSec/GenSec.c
-+++ b/BaseTools/Source/C/GenSec/GenSec.c
-@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
-   PeFileBuffer = (UINT8 *) malloc (PeFileSize);
-   if (PeFileBuffer == NULL) {
-     fclose (InFileHandle);
--    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated  of %s", InFileHandle);
-+    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
-     return EFI_OUT_OF_RESOURCES;
-   }
-   fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);

meta-oniro-core/recipes-core/ovmf/ovmf/0002-edk2-LZMA-gcc12.patch

-# SPDX-FileCopyrightText: TianoCore and contributors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-From 85021f8cf22d1bd4114803c6c610dea5ef0059f1 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Thu, 24 Mar 2022 20:04:35 +0800
-Subject: [PATCH] BaseTools: fix gcc12 warning
-
-Sdk/C/LzmaEnc.c: In function ?LzmaEnc_CodeOneMemBlock?:
-Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*p.rc.outStream? [-Werror=dangling-pointer=]
- 2828 |   p->rc.outStream = &outStream.vt;
-      |   ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
- 2811 |   CLzmaEnc_SeqOutStreamBuf outStream;
-      |                            ^~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
-Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*(CLzmaEnc *)pp.rc.outStream? [-Werror=dangling-pointer=]
- 2828 |   p->rc.outStream = &outStream.vt;
-      |   ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
- 2811 |   CLzmaEnc_SeqOutStreamBuf outStream;
-      |                            ^~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
-cc1: all warnings being treated as errors
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
-Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-Upstream-Status: Backport [commit 85021f8cf22d1bd4114803c6c610dea5ef0059f1]
----
- BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
-index 4e9b499f8d80..4b9f5fa69248 100644
---- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
-+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
-@@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
- 
-   nowPos64 = p->nowPos64;
-   RangeEnc_Init(&p->rc);
--  p->rc.outStream = &outStream.vt;
- 
-   if (desiredPackSize == 0)
-     return SZ_ERROR_OUTPUT_EOF;
- 
-+  p->rc.outStream = &outStream.vt;
-   res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
-+  p->rc.outStream = NULL;
- 
-   *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-   *destLen -= outStream.rem;

meta-oniro-core/recipes-core/ovmf/ovmf_%.bbappend

@@ -5,7 +5,4 @@
 # Backport 3 upstreamed patches to make edk2 work with gcc 12.x
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://0001-edk2-BaseTools-gcc12.patch \
-            file://0002-edk2-LZMA-gcc12.patch \
-            file://0003-edk2-DevicePath-gcc12-workaround.patch \
-           "
+SRC_URI += "file://0003-edk2-DevicePath-gcc12-workaround.patch"