.gitlab-ci.yml

@@ -69,13 +69,6 @@ aggregate-docs:
         CI_ONIRO_MANIFEST_URL: "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL"
         CI_ONIRO_MANIFEST_BRANCH: "$CI_COMMIT_REF_NAME"
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes:
-        - assets/**/*
-        - flavours/**/*
-        - manifests/*.xml
-        - meta-*/**/*
-        - .oniro-ci/*
-        - .gitlab-ci.yml
       # When building a merge request substitute the CI_ONIRO_MANIFEST_URL to point
       # to the incoming repository, and CI_ONIRO_MANIFEST_BRANCH, to the right
       # branch name. This allows testing the changes coming into project. This
@@ -110,6 +103,28 @@ aggregate-docs:
 .publish-rauc-bundle-to-hawkbit:
   extends: [.workspace-rules]
 
+# Build a RAUC update bundle for qemu x86
+bundle-qemu-x86:
+  extends: .build-rauc-bundle
+  stage: update
+  # Depend on the build job to prevent repeating build failures.
+  needs: [linux-qemu-x86]
+  variables:
+    MACHINE: qemux86
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-bundle-base
+
+# Build a RAUC update bundle for qemu x86 64
+bundle-qemu-x86_64:
+  extends: .build-rauc-bundle
+  stage: update
+  # Depend on the build job to prevent repeating build failures.
+  needs: [linux-qemu-x86_64]
+  variables:
+    MACHINE: qemux86-64
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-bundle-base
+
 # Build a RAUC update bundle for Raspberry Pi 4
 bundle-raspberrypi4-64:
   extends: .build-rauc-bundle
@@ -132,6 +147,26 @@ bundle-seco-intel-b68:
     CI_ONIRO_BUILD_FLAVOUR: linux
     CI_ONIRO_RECIPE_NAME: oniro-bundle-base
 
+publish-qemu-x86:
+  extends: .publish-rauc-bundle-to-hawkbit
+  dependencies: [bundle-qemu-x86]
+  needs: [bundle-qemu-x86]
+  variables:
+    CI_ONIRO_HAWKBIT_SWMOD_NAME: oniro-bundle-base-qemu-x86
+    CI_ONIRO_HAWKBIT_DS_NAME: oniro-image-base-qemu-x86
+    CI_ONIRO_RAUC_BUNDLE_NAME: oniro-bundle-base
+    MACHINE: qemux86
+
+publish-qemu-x86_64:
+  extends: .publish-rauc-bundle-to-hawkbit
+  dependencies: [bundle-qemu-x86_64]
+  needs: [bundle-qemu-x86_64]
+  variables:
+    CI_ONIRO_HAWKBIT_SWMOD_NAME: oniro-bundle-base-qemu-x86_64
+    CI_ONIRO_HAWKBIT_DS_NAME: oniro-image-base-qemu-x86_64
+    CI_ONIRO_RAUC_BUNDLE_NAME: oniro-bundle-base
+    MACHINE: qemux86-64
+
 publish-raspberrypi4-64:
   extends: .publish-rauc-bundle-to-hawkbit
   dependencies: [bundle-raspberrypi4-64]

.gitlab/issue_templates/Bug.md

@@ -28,4 +28,4 @@
 
 (link to upstream patch, merge/pull request)
 
-/label ~bug ~needs-investigation
+/label ~Issue::Bug ~needs-investigation ~team::maintenance

.oniro-ci/build-generic.yaml

@@ -194,13 +194,6 @@
         # them).
         time devtool finish --remove-work --force "$CI_ONIRO_DEVTOOL_RECIPE_NAME" "$(basename "$CI_ONIRO_DEVTOOL_LAYER_PATH")";
       fi
-  rules:
-    # Run the job when a merge request is created.
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    # Run the job when a tag is placed.
-    - if: '$CI_COMMIT_TAG'
-    # Run the build for scheduled pipelines.
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
 # This job is documented in docs/ci/hidden-jobs/build-linux.rst
 .build-linux:
@@ -252,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

.oniro-ci/test-generic.yaml

@@ -45,8 +45,7 @@
       -e 's/@ci_project_id@/'"$CI_PROJECT_ID"'/'
       -e 's/@ci_pipeline_id@/'"$CI_PIPELINE_ID"'/'
       -e 's,@ci_pipeline_url@,'"$CI_PIPELINE_URL"','
-      -e 's/@build_job_id@/'"$build_job_id"'/'
-      -e 's,@callback_url@,'"$CALLBACK_URL"',' job_def.yaml
+      -e 's/@build_job_id@/'"$build_job_id"'/' job_def.yaml
     # Generate test jobs.
     - |
       set -x
@@ -72,9 +71,11 @@
     # Submit the jobs to SQUAD.
     - |
       for job_def in $(find lava_jobs/ -name "*.yaml"); do
-        echo $CI_SQUAD_INSTANCE/api/submitjob/oniro-core/$CI_PROJECT_NAME/$CI_COMMIT_SHORT_SHA/$MACHINE --header "Auth-Token: $CI_SQUAD_TOKEN"  --form "backend=oniro_lava" --form "definition=@${job_def}"
-        curl $CI_SQUAD_INSTANCE/api/submitjob/oniro-core/$CI_PROJECT_NAME/$CI_COMMIT_SHORT_SHA/$MACHINE --header "Auth-Token: $CI_SQUAD_TOKEN"  --form "backend=oniro_lava" --form "definition=@${job_def}"
+        echo $CI_SQUAD_INSTANCE/api/submitjob/oniro-core/$CI_PROJECT_NAME/$CI_PIPELINE_ID/$MACHINE --header "Auth-Token: $CI_SQUAD_TOKEN"  --form "backend=oniro_lava" --form "definition=@${job_def}"
+        curl $CI_SQUAD_INSTANCE/api/submitjob/oniro-core/$CI_PROJECT_NAME/$CI_PIPELINE_ID/$MACHINE --header "Auth-Token: $CI_SQUAD_TOKEN"  --form "backend=oniro_lava" --form "definition=@${job_def}"
       done
+      # Attach a callback to this build to trigger the lava-report job
+      curl -X POST $CI_SQUAD_INSTANCE/api/build/$CI_PIPELINE_ID/callbacks/ -F "callback_url=$CALLBACK_URL"
   artifacts:
     paths:
       - lava_jobs/*.yaml
@@ -137,10 +138,8 @@
   script:
     - |
       set -x
-      curl --silent "$CI_API_V4_URL/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/test_report" > test-report.json
-      total_count="$(jq '.total_count' test-report.json)"
-      success_count="$(jq '.success_count' test-report.json)"
-      success_rate=$(( 100 * success_count / total_count ))
+      pass_percentage="$(curl --silent https://squadp.svc.ostc-eu.dev/api/builds/$build_id/status/ | jq -r '.pass_percentage')"
+      success_rate=`printf "%.2f" $pass_percentage`
       anybadge --label=lava-test --value=${success_rate} --suffix='%' --file=lava-test.svg 50=red 60=orange 80=yellow 100=green
       set +x
   artifacts:

CONTRIBUTING.md

@@ -16,6 +16,7 @@ SPDX-License-Identifier: CC-BY-4.0
     -   [Overview](#overview-1)
     -   [Developer Certificate of Origin](#developer-certificate-of-origin)
 -   [`oniro`-specific contributions process and guidelines](#oniro-specific-contributions-process-and-guidelines)
+-   [Eclipse Contributor Agreement](#eclipse-contributor-agreement)
 
 # Gitlab Contributions
 
@@ -215,3 +216,14 @@ Signed-off-by: Joe Developer <joe.developer@example.com>
 
 Please note that by signing off the commit, you make a **legally binding
 statement** that you certify as in the [DCO sign-off](#dco-sign-off) section.
+
+# Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team, contributors must electronically sign the
+[Eclipse Contributor Agreement (ECA)](http://www.eclipse.org/legal/ECA.php)
+
+Commits that are provided by non-committers must have a Signed-off-by field in the footer indicating that the author is aware of the terms by which the contribution has been provided to the project.
+The non-committer must additionally have an Eclipse Foundation account and must have a signed Eclipse Contributor Agreement (ECA) on file.
+
+For more information, please see the [Eclipse Committer Handbook](https://www.eclipse.org/projects/handbook/#resources-commit)
+

docs/conf.py

@@ -22,10 +22,10 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Oniro Project Build System'
-copyright = '2021'
+copyright = '2022'
 author = 'Oniro Project'
 
-version = '1.99.99'
+version = '2.0.0-alpha2'
 release = version
 
 # -- General configuration ---------------------------------------------------

manifests/default.xml

@@ -12,7 +12,8 @@ SPDX-FileCopyrightText: Huawei Inc.
 
 		Check out Oniro Project documentation at https://docs.oniroproject.org
 
-		Meet the developers on mattermost at https://chat.booting.oniroproject.org/
+		Meet the developers on mattermost at https://chat.booting.oniroproject.org/ or
+		point your favorite IRC client to the #oniro channel on https://libera.chat
 
 	</notice>
 
@@ -24,18 +25,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="6ade2bfdd9297896b9f251dd62f55e461fef1a3e" 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="a8cb33d5139e30b4a643da9a277487299c0e658f" 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/conf/distro/oniro-freertos.conf

@@ -7,4 +7,4 @@ require conf/distro/freertos.conf
 
 DISTRO = "oniro-freertos"
 DISTRO_NAME = "Oniro Project Base FreeRTOS Distro"
-DISTRO_VERSION = "1.99.99"
+DISTRO_VERSION = "2.0.0-alpha"

meta-oniro-core/conf/distro/oniro-linux.conf

@@ -4,7 +4,7 @@
 
 DISTRO = "oniro-linux"
 DISTRO_NAME = "Oniro Project Base Linux Distro"
-DISTRO_VERSION = "1.99.99"
+DISTRO_VERSION = "2.0.0-alpha"
 DISTRO_CODENAME = "dev"
 SDK_VENDOR = "-onirosdk"
 SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"

meta-oniro-core/conf/distro/oniro-zephyr.conf

@@ -7,4 +7,4 @@ require conf/distro/zephyr.conf
 
 DISTRO = "oniro-zephyr"
 DISTRO_NAME = "Oniro Project Base Zephyr Distro"
-DISTRO_VERSION = "1.99.99"
+DISTRO_VERSION = "2.0.0-alpha"

meta-oniro-core/recipes-bsp/grub/files/grub.cfg

@@ -7,7 +7,7 @@
 
 serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
 
-set CMDLINE="console=ttyS0,115200 panic=60 quiet"
+set CMDLINE="console=ttyS0,115200 panic=60 rootwait quiet"
 
 # Find the boot partition. We need to know where to load from and save the
 # environment to. The boot partition is saved into the ONIRO_GRUB_BOOT

meta-oniro-core/recipes-core/images/oniro-image-base-dev.bb

@@ -12,3 +12,5 @@ IMAGE_INSTALL:append = "\
     "
 
 EXTRA_IMAGE_FEATURES += "dev-pkgs dbg-pkgs src-pkgs tools-sdk tools-debug tools-profile"
+
+ROOT_PARTITION_SIZE = "2G"

meta-oniro-core/recipes-core/images/oniro-image-extra-dev.bb

@@ -14,4 +14,4 @@ IMAGE_INSTALL:append = "\
 EXTRA_IMAGE_FEATURES += "dev-pkgs dbg-pkgs src-pkgs tools-sdk tools-debug tools-profile"
 
 # With the EXTRA_IMAGE_FEATURES we need to bump the default size of the rootfs
-ROOT_PARTITION_SIZE = "2G"
+ROOT_PARTITION_SIZE = "2500M"

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/0003-edk2-DevicePath-gcc12-workaround.patch

-# SPDX-FileCopyrightText: TianoCore and contributors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-From 22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Thu, 24 Mar 2022 20:04:36 +0800
-Subject: [PATCH] Basetools: turn off gcc12 warning
-
-In function ?SetDevicePathEndNode?,
-    inlined from ?FileDevicePath? at DevicePathUtilities.c:857:5:
-DevicePathUtilities.c:321:3: error: writing 4 bytes into a region of size 1 [-Werror=stringop-overflow=]
-  321 |   memcpy (Node, &mUefiDevicePathLibEndDevicePath, sizeof (mUefiDevicePathLibEndDevicePath));
-      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from UefiDevicePathLib.h:22,
-                 from DevicePathUtilities.c:16:
-../Include/Protocol/DevicePath.h: In function ?FileDevicePath?:
-../Include/Protocol/DevicePath.h:51:9: note: destination object ?Type? of size 1
-   51 |   UINT8 Type;       ///< 0x01 Hardware Device Path.
-      |         ^~~~
-
-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 22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c]
----
- BaseTools/Source/C/DevicePath/GNUmakefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile b/BaseTools/Source/C/DevicePath/GNUmakefile
-index 7ca08af9662d..b05d2bddfa68 100644
---- a/BaseTools/Source/C/DevicePath/GNUmakefile
-+++ b/BaseTools/Source/C/DevicePath/GNUmakefile
-@@ -13,6 +13,9 @@ OBJECTS = DevicePath.o UefiDevicePathLib.o DevicePathFromText.o  DevicePathUtili
- 
- include $(MAKEROOT)/Makefiles/app.makefile
- 
-+# gcc 12 trips over device path handling
-+BUILD_CFLAGS += -Wno-error=stringop-overflow
-+
- LIBS = -lCommon
- ifeq ($(CYGWIN), CYGWIN)
-   LIBS += -L/lib/e2fsprogs -luuid

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

-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# 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 \
-           "