From b486edcf9a5c27909db3f58fa9df4c86b3e97e94 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Fri, 10 Jun 2022 08:41:58 +0200
Subject: [PATCH] ovmf: Drop downstream patch
The change has been implemented upstream in d28d84c5b43ffcc312808af085d949e403805aca
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
...003-edk2-DevicePath-gcc12-workaround.patch | 43 -------------------
.../recipes-core/ovmf/ovmf_%.bbappend | 8 ----
2 files changed, 51 deletions(-)
delete mode 100644 meta-oniro-core/recipes-core/ovmf/ovmf/0003-edk2-DevicePath-gcc12-workaround.patch
delete mode 100644 meta-oniro-core/recipes-core/ovmf/ovmf_%.bbappend
diff --git a/meta-oniro-core/recipes-core/ovmf/ovmf/0003-edk2-DevicePath-gcc12-workaround.patch b/meta-oniro-core/recipes-core/ovmf/ovmf/0003-edk2-DevicePath-gcc12-workaround.patch
deleted file mode 100644
index e266c149..00000000
--- a/meta-oniro-core/recipes-core/ovmf/ovmf/0003-edk2-DevicePath-gcc12-workaround.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
diff --git a/meta-oniro-core/recipes-core/ovmf/ovmf_%.bbappend b/meta-oniro-core/recipes-core/ovmf/ovmf_%.bbappend
deleted file mode 100644
index 1bff792a..00000000
--- a/meta-oniro-core/recipes-core/ovmf/ovmf_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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://0003-edk2-DevicePath-gcc12-workaround.patch"
--
GitLab