diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-10-09 12:57:26 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-08 22:10:54 -0700 |
commit | 80e563697760e2f8adf23fc5e69c56655e9a79cc (patch) | |
tree | d1755331fcee2e369490c0325218a64d3495ab96 /meta-oe | |
parent | 5386a377055f6fe95962c03bfd31e816ed1ed478 (diff) | |
download | meta-openembedded-80e563697760e2f8adf23fc5e69c56655e9a79cc.tar.gz |
multipath-tools: upgrade 0.8.1 -> 0.8.2
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch | 16 | ||||
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch | 57 | ||||
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb (renamed from meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb) | 2 |
4 files changed, 54 insertions, 52 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch index fd1060892..21b8ec6b0 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 |
2 | From:Benjamin Marzinski <bmarzins@redhat.com> | 2 | 00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul |
3 | Date: Wed, 2 Jul 2014 12:49:53 -0500 | 3 | 2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist |
4 | Subject: [PATCH] RH: Remove the property blacklist exception builtin | 4 | exception builtin |
5 | 5 | ||
6 | Multipath set the default property blacklist exceptions to | 6 | Multipath set the default property blacklist exceptions to |
7 | (ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal | 7 | (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> | |||
15 | 15 | ||
16 | Upsteam-Status: Pending | 16 | Upsteam-Status: Pending |
17 | 17 | ||
18 | Update patch to 0.8.0 | 18 | Update patch to 0.8.2 |
19 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 19 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
20 | --- | 20 | --- |
21 | libmultipath/blacklist.c | 13 +++++-------- | 21 | libmultipath/blacklist.c | 13 +++++-------- |
22 | 1 file changed, 5 insertions(+), 8 deletions(-) | 22 | 1 file changed, 5 insertions(+), 8 deletions(-) |
23 | 23 | ||
24 | diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c | 24 | diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c |
25 | index e0d0279..9f58313 100644 | 25 | index 00e8dbd..5204501 100644 |
26 | --- a/libmultipath/blacklist.c | 26 | --- a/libmultipath/blacklist.c |
27 | +++ b/libmultipath/blacklist.c | 27 | +++ b/libmultipath/blacklist.c |
28 | @@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) | 28 | @@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) |
@@ -38,8 +38,8 @@ index e0d0279..9f58313 100644 | |||
38 | str = STRDUP("^(td|hd|vd)[a-z]"); | 38 | str = STRDUP("^(td|hd|vd)[a-z]"); |
39 | if (!str) | 39 | if (!str) |
40 | return 1; | 40 | return 1; |
41 | @@ -415,8 +409,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl) | 41 | @@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl, |
42 | } | 42 | r = MATCH_NOTHING; |
43 | } | 43 | } |
44 | 44 | ||
45 | - log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl); | 45 | - log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl); |
diff --git a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 938262ba4..724bef813 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch | |||
@@ -1,7 +1,10 @@ | |||
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | 1 | From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 |
2 | From: Benjamin Marzinski <bmarzins@redhat.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Fri, 17 Oct 2014 11:20:34 -0500 | 3 | Date: Thu, 26 Sep 2019 16:29:48 +0800 |
4 | Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A | 4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 |
5 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17 | ||
6 | Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline | ||
7 | mpath.wwids with -A | ||
5 | 8 | ||
6 | This patch adds another option to multipath, "-A", which reads | 9 | This patch adds another option to multipath, "-A", which reads |
7 | /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds | 10 | /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> | |||
16 | 19 | ||
17 | Upstream-Status: Pending | 20 | Upstream-Status: Pending |
18 | 21 | ||
19 | Update this patch to new version 0.8.0 | 22 | Update this patch to new version 0.8.2 |
20 | 23 | ||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 24 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
22 | --- | 25 | --- |
@@ -28,10 +31,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
28 | 5 files changed, 57 insertions(+), 1 deletion(-) | 31 | 5 files changed, 57 insertions(+), 1 deletion(-) |
29 | 32 | ||
30 | diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c | 33 | diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c |
31 | index 53e7951..9ba9b62 100644 | 34 | index ef74812..19c4d68 100644 |
32 | --- a/libmultipath/wwids.c | 35 | --- a/libmultipath/wwids.c |
33 | +++ b/libmultipath/wwids.c | 36 | +++ b/libmultipath/wwids.c |
34 | @@ -443,3 +443,47 @@ int op ## _wwid(const char *wwid) \ | 37 | @@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \ |
35 | declare_failed_wwid_op(is_failed, false) | 38 | declare_failed_wwid_op(is_failed, false) |
36 | declare_failed_wwid_op(mark_failed, true) | 39 | declare_failed_wwid_op(mark_failed, true) |
37 | declare_failed_wwid_op(unmark_failed, true) | 40 | declare_failed_wwid_op(unmark_failed, true) |
@@ -92,27 +95,27 @@ index 0c6ee54..e32a0b0 100644 | |||
92 | enum { | 95 | enum { |
93 | WWID_IS_NOT_FAILED = 0, | 96 | WWID_IS_NOT_FAILED = 0, |
94 | diff --git a/multipath/main.c b/multipath/main.c | 97 | diff --git a/multipath/main.c b/multipath/main.c |
95 | index 5abb118..c751b31 100644 | 98 | index 96a1146..5fc65ef 100644 |
96 | --- a/multipath/main.c | 99 | --- a/multipath/main.c |
97 | +++ b/multipath/main.c | 100 | +++ b/multipath/main.c |
98 | @@ -134,6 +134,7 @@ usage (char * progname) | 101 | @@ -139,6 +139,7 @@ usage (char * progname) |
99 | fprintf (stderr, VERSION_STRING); | 102 | fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname); |
100 | fprintf (stderr, "Usage:\n"); | 103 | fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname); |
101 | fprintf (stderr, " %s [-a|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); | 104 | fprintf (stderr, " %s [-v level] -W\n", progname); |
102 | + fprintf (stderr, " %s [-a|-A|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); | 105 | + fprintf (stderr, " %s [-v level] -A\n", progname); |
103 | fprintf (stderr, " %s -l|-ll|-f [-v lvl] [-b fil] [-R num] [dev]\n", progname); | 106 | fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname); |
104 | fprintf (stderr, " %s -F [-v lvl] [-R num]\n", progname); | 107 | fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname); |
105 | fprintf (stderr, " %s [-t|-T]\n", progname); | 108 | fprintf (stderr, " %s [-h|-t|-T]\n", progname); |
106 | @@ -147,6 +148,8 @@ usage (char * progname) | 109 | @@ -151,6 +152,8 @@ usage (char * progname) |
107 | " -f flush a multipath device map\n" | 110 | " -f flush a multipath device map\n" |
108 | " -F flush all multipath device maps\n" | 111 | " -F flush all multipath device maps\n" |
109 | " -a add a device wwid to the wwids file\n" | 112 | " -a add a device wwid to the wwids file\n" |
110 | + " -A add devices from kernel command line mpath.wwids\n" | 113 | + " -A add devices from kernel command line mpath.wwids\n" |
111 | + " parameters to wwids file\n" | 114 | + " parameters to wwids file\n" |
112 | " -c check if a device should be a path in a multipath device\n" | 115 | " -c check if a device should be a path in a multipath device\n" |
113 | " -C check if a multipath device has usable paths\n" | 116 | " -C check if a multipath device has usable paths\n" |
114 | " -q allow queue_if_no_path when multipathd is not running\n" | 117 | " -q allow queue_if_no_path when multipathd is not running\n" |
115 | @@ -870,7 +873,7 @@ main (int argc, char *argv[]) | 118 | @@ -905,7 +908,7 @@ main (int argc, char *argv[]) |
116 | exit(RTVL_FAIL); | 119 | exit(RTVL_FAIL); |
117 | multipath_conf = conf; | 120 | multipath_conf = conf; |
118 | conf->retrigger_tries = 0; | 121 | conf->retrigger_tries = 0; |
@@ -121,17 +124,17 @@ index 5abb118..c751b31 100644 | |||
121 | switch(arg) { | 124 | switch(arg) { |
122 | case 1: printf("optarg : %s\n",optarg); | 125 | case 1: printf("optarg : %s\n",optarg); |
123 | break; | 126 | break; |
124 | @@ -937,6 +940,10 @@ main (int argc, char *argv[]) | 127 | @@ -998,6 +1001,10 @@ main (int argc, char *argv[]) |
125 | case 't': | 128 | case 'R': |
126 | r = dump_config(conf, NULL, NULL) ? RTVL_FAIL : RTVL_OK; | 129 | retries = atoi(optarg); |
127 | goto out_free_config; | 130 | break; |
128 | + case 'A': | 131 | + case 'A': |
129 | + if (remember_cmdline_wwid() != 0) | 132 | + if (remember_cmdline_wwid() != 0) |
130 | + exit(1); | 133 | + exit(1); |
131 | + exit(0); | 134 | + exit(0); |
132 | case 'T': | 135 | case ':': |
133 | cmd = CMD_DUMP_CONFIG; | 136 | fprintf(stderr, "Missing option argument\n"); |
134 | break; | 137 | usage(argv[0]); |
135 | diff --git a/multipath/multipath.8 b/multipath/multipath.8 | 138 | diff --git a/multipath/multipath.8 b/multipath/multipath.8 |
136 | index 9cdd05a..1e120f3 100644 | 139 | index 9cdd05a..1e120f3 100644 |
137 | --- a/multipath/multipath.8 | 140 | --- a/multipath/multipath.8 |
diff --git a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch index 95624ad7a..c59edbbb2 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch | |||
@@ -1,10 +1,7 @@ | |||
1 | From 56d65ecb1c6d814929f6ff3159ade09dc203cc83 Mon Sep 17 00:00:00 2001 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov |
3 | Date: Mon, 26 Nov 2018 10:31:30 +0800 | 3 | 2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of |
4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 | 4 | failing |
5 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov | ||
6 | 2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of | ||
7 | failing | ||
8 | 5 | ||
9 | multipath.conf used to allow "*" as a match everything regular expression, | 6 | multipath.conf used to allow "*" as a match everything regular expression, |
10 | instead of requiring ".*". Instead of erroring when the old style | 7 | instead of requiring ".*". Instead of erroring when the old style |
@@ -15,10 +12,9 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | |||
15 | 12 | ||
16 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
17 | 14 | ||
18 | update this patch to new version | 15 | update this patch to 0.8.2 |
19 | 16 | ||
20 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 17 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
21 | |||
22 | --- | 18 | --- |
23 | libmultipath/dict.c | 29 ++++++++++++++++++++++------- | 19 | libmultipath/dict.c | 29 ++++++++++++++++++++++------- |
24 | libmultipath/parser.c | 13 +++++++++++++ | 20 | libmultipath/parser.c | 13 +++++++++++++ |
@@ -26,7 +22,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
26 | 3 files changed, 36 insertions(+), 7 deletions(-) | 22 | 3 files changed, 36 insertions(+), 7 deletions(-) |
27 | 23 | ||
28 | diff --git a/libmultipath/dict.c b/libmultipath/dict.c | 24 | diff --git a/libmultipath/dict.c b/libmultipath/dict.c |
29 | index eaad4f1..fb30577 100644 | 25 | index c6eba0f..05ed3d8 100644 |
30 | --- a/libmultipath/dict.c | 26 | --- a/libmultipath/dict.c |
31 | +++ b/libmultipath/dict.c | 27 | +++ b/libmultipath/dict.c |
32 | @@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) | 28 | @@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) |
@@ -51,7 +47,7 @@ index eaad4f1..fb30577 100644 | |||
51 | set_yes_no(vector strvec, void *ptr) | 47 | set_yes_no(vector strvec, void *ptr) |
52 | { | 48 | { |
53 | char * buff; | 49 | char * buff; |
54 | @@ -1373,8 +1388,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ | 50 | @@ -1415,8 +1430,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ |
55 | \ | 51 | \ |
56 | if (!conf->option) \ | 52 | if (!conf->option) \ |
57 | return 1; \ | 53 | return 1; \ |
@@ -62,7 +58,7 @@ index eaad4f1..fb30577 100644 | |||
62 | if (!buff) \ | 58 | if (!buff) \ |
63 | return 1; \ | 59 | return 1; \ |
64 | \ | 60 | \ |
65 | @@ -1390,7 +1405,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ | 61 | @@ -1432,7 +1447,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ |
66 | if (!conf->option) \ | 62 | if (!conf->option) \ |
67 | return 1; \ | 63 | return 1; \ |
68 | \ | 64 | \ |
@@ -71,7 +67,7 @@ index eaad4f1..fb30577 100644 | |||
71 | if (!buff) \ | 67 | if (!buff) \ |
72 | return 1; \ | 68 | return 1; \ |
73 | \ | 69 | \ |
74 | @@ -1493,16 +1508,16 @@ device_handler(struct config *conf, vector strvec) | 70 | @@ -1535,16 +1550,16 @@ device_handler(struct config *conf, vector strvec) |
75 | return 0; | 71 | return 0; |
76 | } | 72 | } |
77 | 73 | ||
@@ -93,11 +89,11 @@ index eaad4f1..fb30577 100644 | |||
93 | 89 | ||
94 | declare_hw_handler(hwhandler, set_str) | 90 | declare_hw_handler(hwhandler, set_str) |
95 | diff --git a/libmultipath/parser.c b/libmultipath/parser.c | 91 | diff --git a/libmultipath/parser.c b/libmultipath/parser.c |
96 | index 92ef7cf..0e2cf49 100644 | 92 | index e00c5ff..6ca5842 100644 |
97 | --- a/libmultipath/parser.c | 93 | --- a/libmultipath/parser.c |
98 | +++ b/libmultipath/parser.c | 94 | +++ b/libmultipath/parser.c |
99 | @@ -384,6 +384,19 @@ set_value(vector strvec) | 95 | @@ -382,6 +382,19 @@ oom: |
100 | return alloc; | 96 | return NULL; |
101 | } | 97 | } |
102 | 98 | ||
103 | +void * | 99 | +void * |
@@ -128,3 +124,6 @@ index 62906e9..b791705 100644 | |||
128 | extern int process_file(struct config *conf, char *conf_file); | 124 | extern int process_file(struct config *conf, char *conf_file); |
129 | extern struct keyword * find_keyword(vector keywords, vector v, char * name); | 125 | extern struct keyword * find_keyword(vector keywords, vector v, char * name); |
130 | int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, | 126 | int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, |
127 | -- | ||
128 | 2.7.4 | ||
129 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb index 8d86e606c..06e78c78c 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb | |||
@@ -47,7 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ | |||
47 | 47 | ||
48 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 48 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
49 | 49 | ||
50 | SRCREV = "e23b5d7cf67a9c543e118f2f6b902594a02a804a" | 50 | SRCREV = "8a7e9b6648898f2c2d2bbd2d22871f79612e716e" |
51 | 51 | ||
52 | S = "${WORKDIR}/git" | 52 | S = "${WORKDIR}/git" |
53 | 53 | ||