summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2022-09-17 13:50:42 +0000
committertnn <tnn@pkgsrc.org>2022-09-17 13:50:42 +0000
commit9f0b2dea3e18899f4f0a4aa966fe490e9900a724 (patch)
tree9b3c191cd63c16f334438a35defcb86c584b66b2
parenta347961947ece8064983802714021d7720ffad13 (diff)
downloadpkgsrc-9f0b2dea3e18899f4f0a4aa966fe490e9900a724.tar.gz
qemu: no need to patch file in FILESDIR, apply patch directly
-rw-r--r--emulators/qemu/distinfo3
-rw-r--r--emulators/qemu/files/hw-mips-mipssim_virtio.c1
-rw-r--r--emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c14
3 files changed, 1 insertions, 17 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 7c83314b64e..1d424a6243c 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.194 2022/09/17 09:54:56 tnn Exp $
+$NetBSD: distinfo,v 1.195 2022/09/17 13:50:42 tnn Exp $
BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -12,7 +12,6 @@ SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
-SHA1 (patch-hw_mips_mipssim__virtio.c) = 64e5b8c7a7628a71a3c8f267db882d96ba528941
SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
diff --git a/emulators/qemu/files/hw-mips-mipssim_virtio.c b/emulators/qemu/files/hw-mips-mipssim_virtio.c
index 3af45b2e261..b008dd6c312 100644
--- a/emulators/qemu/files/hw-mips-mipssim_virtio.c
+++ b/emulators/qemu/files/hw-mips-mipssim_virtio.c
@@ -33,7 +33,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
diff --git a/emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c b/emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c
deleted file mode 100644
index 1ce766dcf41..00000000000
--- a/emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-hw_mips_mipssim__virtio.c,v 1.1 2022/09/17 09:54:56 tnn Exp $
-
-Fix build error. mipssim_virtio.c is removed in master.
-
---- hw/mips/mipssim_virtio.c.orig 2022-09-07 17:53:18.000000000 +0000
-+++ hw/mips/mipssim_virtio.c
-@@ -33,7 +33,6 @@
-
- #include "qemu/osdep.h"
- #include "qapi/error.h"
--#include "qemu-common.h"
- #include "cpu.h"
- #include "hw/mips/mips.h"
- #include "hw/mips/cpudevs.h"