mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

multipath-tools: upgrade 0.8.1 -> 0.8.2

Browse Source 
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
2019-10-09 12:57:26 +08:00
committed by Khem Raj
parent 5386a37705
commit 80e5636977
4 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch
+8 -8
View File
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17
From:Benjamin Marzinski <bmarzins@redhat.com> 00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul
Date: Wed, 2 Jul 2014 12:49:53 -0500 2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist
Subject: [PATCH] RH: Remove the property blacklist exception builtin exception builtin
Multipath set the default property blacklist exceptions to Multipath set the default property blacklist exceptions to
(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal (ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal
@@ -15,14 +15,14 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Upsteam-Status: Pending Upsteam-Status: Pending
Update patch to 0.8.0 Update patch to 0.8.2
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
libmultipath/blacklist.c | 13 +++++-------- libmultipath/blacklist.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-) 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
index e0d0279..9f58313 100644 index 00e8dbd..5204501 100644
--- a/libmultipath/blacklist.c --- a/libmultipath/blacklist.c
+++ b/libmultipath/blacklist.c +++ b/libmultipath/blacklist.c
@@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) @@ -192,12 +192,6 @@ setup_default_blist (struct config * conf)
@@ -38,8 +38,8 @@ index e0d0279..9f58313 100644
str = STRDUP("^(td|hd|vd)[a-z]"); str = STRDUP("^(td|hd|vd)[a-z]");
if (!str) if (!str)
return 1; return 1;
@@ -415,8 +409,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl) @@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl,
} r = MATCH_NOTHING;
} }
- log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl); - log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+30 -27
View File
@@ -1,7 +1,10 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com> From: Changqing Li <changqing.li@windriver.com>
Date: Fri, 17 Oct 2014 11:20:34 -0500 Date: Thu, 26 Sep 2019 16:29:48 +0800
Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17
00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17
Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline
mpath.wwids with -A
This patch adds another option to multipath, "-A", which reads This patch adds another option to multipath, "-A", which reads
/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds
@@ -16,7 +19,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Upstream-Status: Pending Upstream-Status: Pending
Update this patch to new version 0.8.0 Update this patch to new version 0.8.2
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
@@ -28,10 +31,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
5 files changed, 57 insertions(+), 1 deletion(-) 5 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
index 53e7951..9ba9b62 100644 index ef74812..19c4d68 100644
--- a/libmultipath/wwids.c --- a/libmultipath/wwids.c
+++ b/libmultipath/wwids.c +++ b/libmultipath/wwids.c
@@ -443,3 +443,47 @@ int op ## _wwid(const char *wwid) \ @@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \
declare_failed_wwid_op(is_failed, false) declare_failed_wwid_op(is_failed, false)
declare_failed_wwid_op(mark_failed, true) declare_failed_wwid_op(mark_failed, true)
declare_failed_wwid_op(unmark_failed, true) declare_failed_wwid_op(unmark_failed, true)
@@ -92,27 +95,27 @@ index 0c6ee54..e32a0b0 100644
enum { enum {
WWID_IS_NOT_FAILED = 0, WWID_IS_NOT_FAILED = 0,
diff --git a/multipath/main.c b/multipath/main.c diff --git a/multipath/main.c b/multipath/main.c
index 5abb118..c751b31 100644 index 96a1146..5fc65ef 100644
--- a/multipath/main.c --- a/multipath/main.c
+++ b/multipath/main.c +++ b/multipath/main.c
@@ -134,6 +134,7 @@ usage (char * progname) @@ -139,6 +139,7 @@ usage (char * progname)
fprintf (stderr, VERSION_STRING); fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname);
fprintf (stderr, "Usage:\n"); fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname);
fprintf (stderr, " %s [-a|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); fprintf (stderr, " %s [-v level] -W\n", progname);
+ fprintf (stderr, " %s [-a|-A|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); + fprintf (stderr, " %s [-v level] -A\n", progname);
fprintf (stderr, " %s -l|-ll|-f [-v lvl] [-b fil] [-R num] [dev]\n", progname); fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname);
fprintf (stderr, " %s -F [-v lvl] [-R num]\n", progname); fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname);
fprintf (stderr, " %s [-t|-T]\n", progname); fprintf (stderr, " %s [-h|-t|-T]\n", progname);
@@ -147,6 +148,8 @@ usage (char * progname) @@ -151,6 +152,8 @@ usage (char * progname)
" -f flush a multipath device map\n" " -f flush a multipath device map\n"
" -F flush all multipath device maps\n" " -F flush all multipath device maps\n"
" -a add a device wwid to the wwids file\n" " -a add a device wwid to the wwids file\n"
+ " -A add devices from kernel command line mpath.wwids\n" + " -A add devices from kernel command line mpath.wwids\n"
+ " parameters to wwids file\n" + " parameters to wwids file\n"
" -c check if a device should be a path in a multipath device\n" " -c check if a device should be a path in a multipath device\n"
" -C check if a multipath device has usable paths\n" " -C check if a multipath device has usable paths\n"
" -q allow queue_if_no_path when multipathd is not running\n" " -q allow queue_if_no_path when multipathd is not running\n"
@@ -870,7 +873,7 @@ main (int argc, char *argv[]) @@ -905,7 +908,7 @@ main (int argc, char *argv[])
exit(RTVL_FAIL); exit(RTVL_FAIL);
multipath_conf = conf; multipath_conf = conf;
conf->retrigger_tries = 0; conf->retrigger_tries = 0;
@@ -121,17 +124,17 @@ index 5abb118..c751b31 100644
switch(arg) { switch(arg) {
case 1: printf("optarg : %s\n",optarg); case 1: printf("optarg : %s\n",optarg);
break; break;
@@ -937,6 +940,10 @@ main (int argc, char *argv[]) @@ -998,6 +1001,10 @@ main (int argc, char *argv[])
case 't': case 'R':
r = dump_config(conf, NULL, NULL) ? RTVL_FAIL : RTVL_OK; retries = atoi(optarg);
goto out_free_config; break;
+ case 'A': + case 'A':
+ if (remember_cmdline_wwid() != 0) + if (remember_cmdline_wwid() != 0)
+ exit(1); + exit(1);
+ exit(0); + exit(0);
case 'T': case ':':
cmd = CMD_DUMP_CONFIG; fprintf(stderr, "Missing option argument\n");
break; usage(argv[0]);
diff --git a/multipath/multipath.8 b/multipath/multipath.8 diff --git a/multipath/multipath.8 b/multipath/multipath.8
index 9cdd05a..1e120f3 100644 index 9cdd05a..1e120f3 100644
--- a/multipath/multipath.8 --- a/multipath/multipath.8
meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch
+15 -16
View File
@@ -1,10 +1,7 @@
From 56d65ecb1c6d814929f6ff3159ade09dc203cc83 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17
From: Changqing Li <changqing.li@windriver.com> 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov
Date: Mon, 26 Nov 2018 10:31:30 +0800 2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of
Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 failing
00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov
2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of
failing
multipath.conf used to allow "*" as a match everything regular expression, multipath.conf used to allow "*" as a match everything regular expression,
instead of requiring ".*". Instead of erroring when the old style instead of requiring ".*". Instead of erroring when the old style
@@ -15,10 +12,9 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Upstream-Status: Pending Upstream-Status: Pending
update this patch to new version update this patch to 0.8.2
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
libmultipath/dict.c | 29 ++++++++++++++++++++++------- libmultipath/dict.c | 29 ++++++++++++++++++++++-------
libmultipath/parser.c | 13 +++++++++++++ libmultipath/parser.c | 13 +++++++++++++
@@ -26,7 +22,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
3 files changed, 36 insertions(+), 7 deletions(-) 3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/libmultipath/dict.c b/libmultipath/dict.c diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index eaad4f1..fb30577 100644 index c6eba0f..05ed3d8 100644
--- a/libmultipath/dict.c --- a/libmultipath/dict.c
+++ b/libmultipath/dict.c +++ b/libmultipath/dict.c
@@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) @@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr)
@@ -51,7 +47,7 @@ index eaad4f1..fb30577 100644
set_yes_no(vector strvec, void *ptr) set_yes_no(vector strvec, void *ptr)
{ {
char * buff; char * buff;
@@ -1373,8 +1388,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ @@ -1415,8 +1430,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \
\ \
if (!conf->option) \ if (!conf->option) \
return 1; \ return 1; \
@@ -62,7 +58,7 @@ index eaad4f1..fb30577 100644
if (!buff) \ if (!buff) \
return 1; \ return 1; \
\ \
@@ -1390,7 +1405,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ @@ -1432,7 +1447,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \
if (!conf->option) \ if (!conf->option) \
return 1; \ return 1; \
\ \
@@ -71,7 +67,7 @@ index eaad4f1..fb30577 100644
if (!buff) \ if (!buff) \
return 1; \ return 1; \
\ \
@@ -1493,16 +1508,16 @@ device_handler(struct config *conf, vector strvec) @@ -1535,16 +1550,16 @@ device_handler(struct config *conf, vector strvec)
return 0; return 0;
} }
@@ -93,11 +89,11 @@ index eaad4f1..fb30577 100644
declare_hw_handler(hwhandler, set_str) declare_hw_handler(hwhandler, set_str)
diff --git a/libmultipath/parser.c b/libmultipath/parser.c diff --git a/libmultipath/parser.c b/libmultipath/parser.c
index 92ef7cf..0e2cf49 100644 index e00c5ff..6ca5842 100644
--- a/libmultipath/parser.c --- a/libmultipath/parser.c
+++ b/libmultipath/parser.c +++ b/libmultipath/parser.c
@@ -384,6 +384,19 @@ set_value(vector strvec) @@ -382,6 +382,19 @@ oom:
return alloc; return NULL;
} }
+void * +void *
@@ -128,3 +124,6 @@ index 62906e9..b791705 100644
extern int process_file(struct config *conf, char *conf_file); extern int process_file(struct config *conf, char *conf_file);
extern struct keyword * find_keyword(vector keywords, vector v, char * name); extern struct keyword * find_keyword(vector keywords, vector v, char * name);
int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw,
--
2.7.4
meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb → meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb
+1 -1
View File
@@ -47,7 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SRCREV = "e23b5d7cf67a9c543e118f2f6b902594a02a804a" SRCREV = "8a7e9b6648898f2c2d2bbd2d22871f79612e716e"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"