pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qemu-git: Drop merged Illumos patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Sep 9 16:08:18 2017 +0200
Changeset: 86f6d9a938384c1f2157a13a6d519637414a2829
Modified Files:
qemu-git/distinfo
Removed Files:
qemu-git/patches/patch-hw_net_e1000.c
qemu-git/patches/patch-hw_net_e1000__regs.h
qemu-git/patches/patch-hw_net_e1000e__core.c
qemu-git/patches/patch-hw_net_e1000x__common.h
Log Message:
qemu-git: Drop merged Illumos patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=86f6d9a938384c1f2157a13a6d519637414a2829
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qemu-git/distinfo | 4 ----
qemu-git/patches/patch-hw_net_e1000.c | 22 ----------------------
qemu-git/patches/patch-hw_net_e1000__regs.h | 13 -------------
qemu-git/patches/patch-hw_net_e1000e__core.c | 13 -------------
qemu-git/patches/patch-hw_net_e1000x__common.h | 13 -------------
5 files changed, 65 deletions(-)
diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index e9123ebc61..d21292926f 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,10 +4,6 @@ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
-SHA1 (patch-hw_net_e1000.c) = 04c528fa18e16a8360785c82793c6e9b09fb5be4
-SHA1 (patch-hw_net_e1000__regs.h) = de19b1044fb7dc12101551b18316a891620027f0
-SHA1 (patch-hw_net_e1000e__core.c) = b36b84fcd76da62a4fb4009448f6bbd2b82032e2
-SHA1 (patch-hw_net_e1000x__common.h) = d7977a94289bcf30b68b7a0cd4e6e9c23692f8ac
SHA1 (patch-hw_scsi_esp.c) = aa7030ac8d09082bd57044e6a0d4e2fc5c066a45
SHA1 (patch-hw_usb_dev-mtp.c) = abd0146b4369146bdcd1038906b057c3d0362e80
SHA1 (patch-memory.c) = 30074f7f93c79dfc22ad4fb745f9e34941f831e6
diff --git a/qemu-git/patches/patch-hw_net_e1000.c b/qemu-git/patches/patch-hw_net_e1000.c
deleted file mode 100644
index 235d5eae76..0000000000
--- a/qemu-git/patches/patch-hw_net_e1000.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- hw/net/e1000.c.orig 2017-08-25 15:26:30.000000000 +0000
-+++ hw/net/e1000.c
-@@ -1127,7 +1127,7 @@ static uint32_t (*macreg_readops[])(E100
- getreg(TADV), getreg(ITR), getreg(FCRUC), getreg(IPAV),
- getreg(WUC), getreg(WUS), getreg(SCC), getreg(ECOL),
- getreg(MCC), getreg(LATECOL), getreg(COLC), getreg(DC),
-- getreg(TNCRS), getreg(SEC), getreg(CEXTERR), getreg(RLEC),
-+ getreg(TNCRS), getreg(SEQEC), getreg(CEXTERR), getreg(RLEC),
- getreg(XONRXC), getreg(XONTXC), getreg(XOFFRXC), getreg(XOFFTXC),
- getreg(RFC), getreg(RJC), getreg(RNBC), getreg(TSCTFC),
- getreg(MGTPRC), getreg(MGTPDC), getreg(MGTPTC), getreg(GORCL),
-@@ -1223,7 +1223,7 @@ static const uint8_t mac_reg_access[0x80
- [FFLT] = markflag(MAC), [FFMT] = markflag(MAC),
- [SCC] = markflag(MAC), [FCRUC] = markflag(MAC),
- [LATECOL] = markflag(MAC), [COLC] = markflag(MAC),
-- [SEC] = markflag(MAC), [CEXTERR] = markflag(MAC),
-+ [SEQEC] = markflag(MAC), [CEXTERR] = markflag(MAC),
- [XONTXC] = markflag(MAC), [XOFFRXC] = markflag(MAC),
- [RJC] = markflag(MAC), [RNBC] = markflag(MAC),
- [MGTPDC] = markflag(MAC), [MGTPTC] = markflag(MAC),
diff --git a/qemu-git/patches/patch-hw_net_e1000__regs.h b/qemu-git/patches/patch-hw_net_e1000__regs.h
deleted file mode 100644
index b91d8db857..0000000000
--- a/qemu-git/patches/patch-hw_net_e1000__regs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- hw/net/e1000_regs.h.orig 2017-08-25 15:26:30.000000000 +0000
-+++ hw/net/e1000_regs.h
-@@ -260,7 +260,7 @@
- #define E1000_COLC 0x04028 /* Collision Count - R/clr */
- #define E1000_DC 0x04030 /* Defer Count - R/clr */
- #define E1000_TNCRS 0x04034 /* TX-No CRS - R/clr */
--#define E1000_SEC 0x04038 /* Sequence Error Count - R/clr */
-+#define E1000_SEQEC 0x04038 /* Sequence Error Count - R/clr */
- #define E1000_CEXTERR 0x0403C /* Carrier Extension Error Count - R/clr */
- #define E1000_RLEC 0x04040 /* Receive Length Error Count - R/clr */
- #define E1000_XONRXC 0x04048 /* XON RX Count - R/clr */
diff --git a/qemu-git/patches/patch-hw_net_e1000e__core.c b/qemu-git/patches/patch-hw_net_e1000e__core.c
deleted file mode 100644
index e6c96e4b55..0000000000
--- a/qemu-git/patches/patch-hw_net_e1000e__core.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- hw/net/e1000e_core.c.orig 2017-08-25 15:26:30.000000000 +0000
-+++ hw/net/e1000e_core.c
-@@ -2855,7 +2855,7 @@ static uint32_t (*e1000e_macreg_readops[
- e1000e_getreg(RDLEN0),
- e1000e_getreg(RDH1),
- e1000e_getreg(LATECOL),
-- e1000e_getreg(SEC),
-+ e1000e_getreg(SEQEC),
- e1000e_getreg(XONTXC),
- e1000e_getreg(WUS),
- e1000e_getreg(GORCL),
diff --git a/qemu-git/patches/patch-hw_net_e1000x__common.h b/qemu-git/patches/patch-hw_net_e1000x__common.h
deleted file mode 100644
index 0342f6a2b9..0000000000
--- a/qemu-git/patches/patch-hw_net_e1000x__common.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- hw/net/e1000x_common.h.orig 2017-08-25 15:26:30.000000000 +0000
-+++ hw/net/e1000x_common.h
-@@ -40,7 +40,7 @@ enum {
- defreg(VFTA), defreg(VET), defreg(RDTR), defreg(RADV),
- defreg(TADV), defreg(ITR), defreg(SCC), defreg(ECOL),
- defreg(MCC), defreg(LATECOL), defreg(COLC), defreg(DC),
-- defreg(TNCRS), defreg(SEC), defreg(CEXTERR), defreg(RLEC),
-+ defreg(TNCRS), defreg(SEQEC), defreg(CEXTERR), defreg(RLEC),
- defreg(XONRXC), defreg(XONTXC), defreg(XOFFRXC), defreg(XOFFTXC),
- defreg(FCRUC), defreg(AIT), defreg(TDFH), defreg(TDFT),
- defreg(TDFHS), defreg(TDFTS), defreg(TDFPC), defreg(WUC),
Home |
Main Index |
Thread Index |
Old Index