From 0f018ab269a65819155f66f55ff6fce348526b2a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 18 Jan 2024 12:33:57 -0700 Subject: qemu: Remove qemu-6.1.0 remnants Some remnants of prior qemu 6.1.0 support were still present, remove them. Signed-off-by: Mark Hatle --- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 29 ------------- .../qemu/qemu-xilinx-6.1.0/cross.patch | 40 ------------------ .../recipes-devtools/qemu/qemu-xilinx.inc | 47 ---------------------- 3 files changed, 116 deletions(-) delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc (limited to 'meta-xilinx-core/recipes-devtools') diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch deleted file mode 100644 index 4298964d..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b51e6dd833172954c718bd600d846540eeb07220 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [PATCH] configure: Add pkg-config handling for libgcrypt - -libgcrypt may also be controlled by pkg-config, this patch adds pkg-config -handling for libgcrypt. - -Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] - -Signed-off-by: He Zhe - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index b3e7ec0e9..4cbe715b7 100644 ---- a/meson.build -+++ b/meson.build -@@ -874,7 +874,7 @@ endif - if not gnutls_crypto.found() - if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() - gcrypt = dependency('libgcrypt', version: '>=1.8', -- method: 'config-tool', -+ method: 'pkg-config', - required: get_option('gcrypt'), - kwargs: static_kwargs) - # Debian has removed -lgpg-error from libgcrypt-config diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch deleted file mode 100644 index bdb77ec7..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Tue, 5 Jan 2021 23:00:14 +0000 -Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0 - -We need to be able to trigger configure's cross code but we don't want -to set cross_prefix as it does other things we don't want. Patch things -so we can do what we need in the target config case. - -Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] -Signed-off-by: Richard Purdie ---- - configure | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/configure b/configure -index 9a79a004d..563b7827f 100755 ---- a/configure -+++ b/configure -@@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then - fi - echo "strip = [$(meson_quote $strip)]" >> $cross - echo "windres = [$(meson_quote $windres)]" >> $cross -- if test "$cross_compile" = "yes"; then - cross_arg="--cross-file config-meson.cross" - echo "[host_machine]" >> $cross - if test "$mingw32" = "yes" ; then -@@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then - else - echo "endian = 'little'" >> $cross - fi -- else -- cross_arg="--native-file config-meson.cross" -- fi - mv $cross config-meson.cross - - rm -rf meson-private meson-info meson-logs --- -2.17.1 - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc deleted file mode 100644 index 788a3fe0..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Xilinx's fork of a fast open source processor emulator" -HOMEPAGE = "https://github.com/xilinx/qemu/" - -# x86_64 is needed to build nativesdks -QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64" - -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f \ - " -DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" - -FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-6.1.0:" - -PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" -REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG}" - -SRC_URI:append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch" - -S = "${WORKDIR}/git" - -# Disable KVM completely -PACKAGECONFIG:remove = "kvm" -PACKAGECONFIG:append = " fdt sdl gcrypt pie slirp" - - -# Remove when version is in sync with core oe-core -PACKAGECONFIG:remove:class-nativesdk= "pulsedio" -PACKAGECONFIG:remove:class-native = "pulsedio" -PACKAGECONFIG[alsa] = "--audio-drv-list=alsa,,alsa-lib" -PACKAGECONFIG[pulsedio] = "--audio-drv-list=pa,,pulseaudio" -PACKAGECONFIG[selinux] = "" -PACKAGECONFIG[slirp] = "--enable-slirp=git,--disable-slirp,," -PACKAGECONFIG[jack] = "" - -DISABLE_STATIC:pn-${PN} = "" - -do_install:append() { - # Prevent QA warnings about installed ${localstatedir}/run - if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi -} - -FILES:${PN} += "${datadir}/qemu/" -FILES:${PN}:append:class-nativesdk:mingw32 = " ${SDKPATHNATIVE}" -- cgit v1.2.3-54-g00ecf