commit: 74633a6d0730cba43f297781969c38aef3b29369 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Aug 11 14:48:56 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 11:28:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74633a6d
sys-libs/efivar: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/5390 sys-libs/efivar/files/0.21-initializer.patch | 42 --------------------------- sys-libs/efivar/files/0.21-nvme_ioctl.h.patch | 30 ------------------- sys-libs/efivar/files/0.23-sysmacros.patch | 29 ------------------ 3 files changed, 101 deletions(-) diff --git a/sys-libs/efivar/files/0.21-initializer.patch b/sys-libs/efivar/files/0.21-initializer.patch deleted file mode 100644 index 25d06596831..00000000000 --- a/sys-libs/efivar/files/0.21-initializer.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a3606c02fd271d32e364fcc540e34ba1899309f6 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Tue, 14 Jul 2015 09:33:54 -0400 -Subject: [PATCH] Sometimes the compiler doesn't like { 0, } as an - initializer... - -Because it really wants to be { {0, },} or something, and sometimes the -compiler, knowing full well what we're trying to do, likes to complain -about the rigor applied to our technique in doing it. - -memset() the struct ifreq to 0 instead so I don't need to figure out its -internal structure just to zero it out. - -Resolves #28 - -Signed-off-by: Peter Jones <[email protected]> ---- - src/linux.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/linux.c b/src/linux.c -index 57f71f3..817b8e6 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -847,12 +847,13 @@ ssize_t - __attribute__((__visibility__ ("hidden"))) - make_mac_path(uint8_t *buf, ssize_t size, const char * const ifname) - { -- struct ifreq ifr = { 0, }; -+ struct ifreq ifr; - struct ethtool_drvinfo drvinfo = { 0, }; - int fd, rc; - ssize_t ret = -1, sz, off=0; - char busname[PATH_MAX+1] = ""; - -+ memset(&ifr, 0, sizeof (ifr)); - strncpy(ifr.ifr_name, ifname, IF_NAMESIZE); - drvinfo.cmd = ETHTOOL_GDRVINFO; - ifr.ifr_data = (caddr_t)&drvinfo; --- -2.4.6 - diff --git a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch b/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch deleted file mode 100644 index 221ec5a7314..00000000000 --- a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Thu, 14 Jan 2016 17:02:31 -0500 -Subject: [PATCH] Workaround rename of linux/nvme.h - -Bug: https://bugs.gentoo.org/571548 ---- - src/linux.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/linux.c b/src/linux.c -index 5ebc151..e551377 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -22,7 +22,12 @@ - #include <inttypes.h> - #include <limits.h> - #include <linux/ethtool.h> -+#include <linux/version.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) -+#include <linux/nvme_ioctl.h> -+#else - #include <linux/nvme.h> -+#endif - #include <linux/sockios.h> - #include <net/if.h> - #include <scsi/scsi.h> --- -2.7.0 - diff --git a/sys-libs/efivar/files/0.23-sysmacros.patch b/sys-libs/efivar/files/0.23-sysmacros.patch deleted file mode 100644 index 526b8436c2d..00000000000 --- a/sys-libs/efivar/files/0.23-sysmacros.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Fri, 15 Apr 2016 17:58:15 -0400 -Subject: [PATCH] Include sys/sysmacros.h when sys/types.h does not define - major - -glibc is planning to drop this from sys/types.h. ---- - src/linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/linux.c b/src/linux.c -index 866455d..fde6947 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -36,6 +36,10 @@ - #include <sys/stat.h> - #include <unistd.h> - -+#ifndef major -+#include <sys/sysmacros.h> -+#endif -+ - #include <efivar.h> - #include <efiboot.h> - --- -2.8.1 -
