From 5cdb157693c65974f42bc283da759313245d6e82 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 1 Feb 2024 15:46:58 -0700 Subject: qemu-xilinx: Fix potential issue w/ poky master-next Currently poky master-next has a few patches for QEMU 8.2 to workaround a new requirement for some MMAP flags. For 7.1, we need to make sure we don't have these patches as they are not relevant. If this patch is not merged into Poky, we can drop this patch. Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc index 9056fc69..4b0aceb8 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc @@ -44,6 +44,10 @@ SRC_URI += "\ file://qemu-guest-agent.udev \ " +# Workaround for 8.2 patch that doesn't apply +SRC_URI:remove = "file://0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch" +SRC_URI:remove = "file://0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch" + S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ -- cgit v1.2.3-54-g00ecf