From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 16 Sep 2020 09:32:48 +0100
Subject: gentoo resync : 16.09.2020

---
 ...path-tools-0.6.2-ignore-modprobe-failures.patch | 25 ---------
 .../files/multipath-tools-0.6.4-sysmacros.patch    | 60 ----------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
 delete mode 100644 sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch

(limited to 'sys-fs/multipath-tools/files')

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
deleted file mode 100644
index cb785899c2ed..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 12 Sep 2016 17:26:38 -0400
-Subject: [PATCH] multipathd.service: ignore modprobe failures
-
----
- multipathd/multipathd.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index e3d6f91..d26577f 100644
---- a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -11,7 +11,7 @@ Conflicts=shutdown.target
- Type=notify
- NotifyAccess=main
- LimitCORE=infinity
--ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
-+ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- 
--- 
-2.10.0
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
deleted file mode 100644
index 99a12fc7b784..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c
-index 1206e45..f50c1bd 100644
---- a/kpartx/dasd.c
-+++ b/kpartx/dasd.c
-@@ -28,6 +28,7 @@
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <linux/hdreg.h>
- #include <errno.h>
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index d31fea8..3452787 100644
---- a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <ctype.h>
- #include <libdevmapper.h>
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
-index 4d6c3c2..d9a9e67 100644
---- a/libmultipath/checkers/tur.c
-+++ b/libmultipath/checkers/tur.c
-@@ -11,6 +11,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/time.h>
- #include <pthread.h>
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 4f8ef13..9c0b240 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -12,6 +12,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- 
- #include "checkers.h"
- #include "vector.h"
-diff --git a/libmultipath/util.c b/libmultipath/util.c
-index 03a5738..1841f35 100644
---- a/libmultipath/util.c
-+++ b/libmultipath/util.c
-@@ -4,6 +4,7 @@
- #include <pthread.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-- 
cgit v1.2.3