| 1 |
commit: 74633a6d0730cba43f297781969c38aef3b29369 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Aug 11 14:48:56 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 13 11:28:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74633a6d |
| 7 |
|
| 8 |
sys-libs/efivar: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5390 |
| 11 |
|
| 12 |
sys-libs/efivar/files/0.21-initializer.patch | 42 --------------------------- |
| 13 |
sys-libs/efivar/files/0.21-nvme_ioctl.h.patch | 30 ------------------- |
| 14 |
sys-libs/efivar/files/0.23-sysmacros.patch | 29 ------------------ |
| 15 |
3 files changed, 101 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/efivar/files/0.21-initializer.patch b/sys-libs/efivar/files/0.21-initializer.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 25d06596831..00000000000 |
| 20 |
--- a/sys-libs/efivar/files/0.21-initializer.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,42 +0,0 @@ |
| 23 |
-From a3606c02fd271d32e364fcc540e34ba1899309f6 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Peter Jones <pjones@××××××.com> |
| 25 |
-Date: Tue, 14 Jul 2015 09:33:54 -0400 |
| 26 |
-Subject: [PATCH] Sometimes the compiler doesn't like { 0, } as an |
| 27 |
- initializer... |
| 28 |
- |
| 29 |
-Because it really wants to be { {0, },} or something, and sometimes the |
| 30 |
-compiler, knowing full well what we're trying to do, likes to complain |
| 31 |
-about the rigor applied to our technique in doing it. |
| 32 |
- |
| 33 |
-memset() the struct ifreq to 0 instead so I don't need to figure out its |
| 34 |
-internal structure just to zero it out. |
| 35 |
- |
| 36 |
-Resolves #28 |
| 37 |
- |
| 38 |
-Signed-off-by: Peter Jones <pjones@××××××.com> |
| 39 |
---- |
| 40 |
- src/linux.c | 3 ++- |
| 41 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 42 |
- |
| 43 |
-diff --git a/src/linux.c b/src/linux.c |
| 44 |
-index 57f71f3..817b8e6 100644 |
| 45 |
---- a/src/linux.c |
| 46 |
-+++ b/src/linux.c |
| 47 |
-@@ -847,12 +847,13 @@ ssize_t |
| 48 |
- __attribute__((__visibility__ ("hidden"))) |
| 49 |
- make_mac_path(uint8_t *buf, ssize_t size, const char * const ifname) |
| 50 |
- { |
| 51 |
-- struct ifreq ifr = { 0, }; |
| 52 |
-+ struct ifreq ifr; |
| 53 |
- struct ethtool_drvinfo drvinfo = { 0, }; |
| 54 |
- int fd, rc; |
| 55 |
- ssize_t ret = -1, sz, off=0; |
| 56 |
- char busname[PATH_MAX+1] = ""; |
| 57 |
- |
| 58 |
-+ memset(&ifr, 0, sizeof (ifr)); |
| 59 |
- strncpy(ifr.ifr_name, ifname, IF_NAMESIZE); |
| 60 |
- drvinfo.cmd = ETHTOOL_GDRVINFO; |
| 61 |
- ifr.ifr_data = (caddr_t)&drvinfo; |
| 62 |
--- |
| 63 |
-2.4.6 |
| 64 |
- |
| 65 |
|
| 66 |
diff --git a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch b/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch |
| 67 |
deleted file mode 100644 |
| 68 |
index 221ec5a7314..00000000000 |
| 69 |
--- a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,30 +0,0 @@ |
| 72 |
-From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001 |
| 73 |
-From: Mike Gilbert <floppym@g.o> |
| 74 |
-Date: Thu, 14 Jan 2016 17:02:31 -0500 |
| 75 |
-Subject: [PATCH] Workaround rename of linux/nvme.h |
| 76 |
- |
| 77 |
-Bug: https://bugs.gentoo.org/571548 |
| 78 |
---- |
| 79 |
- src/linux.c | 5 +++++ |
| 80 |
- 1 file changed, 5 insertions(+) |
| 81 |
- |
| 82 |
-diff --git a/src/linux.c b/src/linux.c |
| 83 |
-index 5ebc151..e551377 100644 |
| 84 |
---- a/src/linux.c |
| 85 |
-+++ b/src/linux.c |
| 86 |
-@@ -22,7 +22,12 @@ |
| 87 |
- #include <inttypes.h> |
| 88 |
- #include <limits.h> |
| 89 |
- #include <linux/ethtool.h> |
| 90 |
-+#include <linux/version.h> |
| 91 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) |
| 92 |
-+#include <linux/nvme_ioctl.h> |
| 93 |
-+#else |
| 94 |
- #include <linux/nvme.h> |
| 95 |
-+#endif |
| 96 |
- #include <linux/sockios.h> |
| 97 |
- #include <net/if.h> |
| 98 |
- #include <scsi/scsi.h> |
| 99 |
--- |
| 100 |
-2.7.0 |
| 101 |
- |
| 102 |
|
| 103 |
diff --git a/sys-libs/efivar/files/0.23-sysmacros.patch b/sys-libs/efivar/files/0.23-sysmacros.patch |
| 104 |
deleted file mode 100644 |
| 105 |
index 526b8436c2d..00000000000 |
| 106 |
--- a/sys-libs/efivar/files/0.23-sysmacros.patch |
| 107 |
+++ /dev/null |
| 108 |
@@ -1,29 +0,0 @@ |
| 109 |
-From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001 |
| 110 |
-From: Mike Gilbert <floppym@g.o> |
| 111 |
-Date: Fri, 15 Apr 2016 17:58:15 -0400 |
| 112 |
-Subject: [PATCH] Include sys/sysmacros.h when sys/types.h does not define |
| 113 |
- major |
| 114 |
- |
| 115 |
-glibc is planning to drop this from sys/types.h. |
| 116 |
---- |
| 117 |
- src/linux.c | 4 ++++ |
| 118 |
- 1 file changed, 4 insertions(+) |
| 119 |
- |
| 120 |
-diff --git a/src/linux.c b/src/linux.c |
| 121 |
-index 866455d..fde6947 100644 |
| 122 |
---- a/src/linux.c |
| 123 |
-+++ b/src/linux.c |
| 124 |
-@@ -36,6 +36,10 @@ |
| 125 |
- #include <sys/stat.h> |
| 126 |
- #include <unistd.h> |
| 127 |
- |
| 128 |
-+#ifndef major |
| 129 |
-+#include <sys/sysmacros.h> |
| 130 |
-+#endif |
| 131 |
-+ |
| 132 |
- #include <efivar.h> |
| 133 |
- #include <efiboot.h> |
| 134 |
- |
| 135 |
--- |
| 136 |
-2.8.1 |
| 137 |
- |
Archives