diff options
19 files changed, 377 insertions, 526 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch new file mode 100644 index 000000000..0ec5b5b1c --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001 | ||
2 | From: Benjamin Marzinski <bmarzins@redhat.com> | ||
3 | Date: Thu, 13 Apr 2017 07:22:23 -0500 | ||
4 | Subject: [PATCH 01/12] RH: fixup udev rules for redhat | ||
5 | |||
6 | The multipath rules need to run after scsi_id is run. This means moving | ||
7 | them after 60-persistent-storage.rules for redhat. Redhat also uses a | ||
8 | different naming scheme for partitions than SuSE. Also, there are some | ||
9 | false warnings that gcc throws because of the changed options. Fix these | ||
10 | too. | ||
11 | |||
12 | Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | ||
13 | |||
14 | [OP: Rebase to 0.9.3] | ||
15 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
16 | |||
17 | Rebase to 0.9.8 | ||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | --- | ||
20 | Makefile.inc | 2 +- | ||
21 | kpartx/kpartx.rules | 2 +- | ||
22 | multipath/Makefile | 4 ++-- | ||
23 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
24 | |||
25 | diff --git a/Makefile.inc b/Makefile.inc | ||
26 | index 5668e638..de89b21f 100644 | ||
27 | --- a/Makefile.inc | ||
28 | +++ b/Makefile.inc | ||
29 | @@ -59,7 +59,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d | ||
30 | modulesloaddir := $(systemd_prefix)lib/modules-load.d | ||
31 | libudevdir := $(systemd_prefix)lib/udev | ||
32 | udevrulesdir := $(libudevdir)/rules.d | ||
33 | -bindir := $(exec_prefix)sbin | ||
34 | +bindir := $(exec_prefix)/usr/sbin | ||
35 | mandir := $(usr_prefix)share/man | ||
36 | LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib) | ||
37 | syslibdir := $(prefix)$(LIB) | ||
38 | diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules | ||
39 | index 1969dee0..d2b28233 100644 | ||
40 | --- a/kpartx/kpartx.rules | ||
41 | +++ b/kpartx/kpartx.rules | ||
42 | @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" | ||
43 | GOTO="kpartx_end" | ||
44 | |||
45 | LABEL="run_kpartx" | ||
46 | -RUN+="/sbin/kpartx -un -p -part /dev/$name" | ||
47 | +RUN+="/sbin/kpartx -un /dev/$name" | ||
48 | |||
49 | LABEL="kpartx_end" | ||
50 | diff --git a/multipath/Makefile b/multipath/Makefile | ||
51 | index 67fb5e62..2ea9e528 100644 | ||
52 | --- a/multipath/Makefile | ||
53 | +++ b/multipath/Makefile | ||
54 | @@ -27,7 +27,7 @@ install: | ||
55 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) | ||
56 | $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) | ||
57 | $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) | ||
58 | - $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules | ||
59 | + $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules | ||
60 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) | ||
61 | $(Q)$(INSTALL_PROGRAM) -m 644 tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/multipath.conf | ||
62 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man8 | ||
63 | @@ -50,7 +50,7 @@ uninstall: | ||
64 | $(Q)$(RM) $(DESTDIR)$(udevrulesdir)/99-z-dm-mpath-late.rules | ||
65 | $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf | ||
66 | $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf | ||
67 | - $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules | ||
68 | + $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules | ||
69 | $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 | ||
70 | $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 | ||
71 | $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf | ||
72 | -- | ||
73 | 2.25.1 | ||
74 | |||
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/0002-RH-Remove-the-property-blacklist-exception-builtin.patch index c15444a85..a24c827dc 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/0002-RH-Remove-the-property-blacklist-exception-builtin.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 | 1 | From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001 |
2 | 00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | 2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist | 3 | Date: Fri, 1 Mar 2024 10:34:06 +0800 |
4 | exception builtin | 4 | Subject: [PATCH 02/12] RH: Remove the property blacklist 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,31 +15,36 @@ 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.2 | ||
19 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
20 | [OP: Rebase to 0.9.3] | 18 | [OP: Rebase to 0.9.3] |
21 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | 19 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
22 | --- | ||
23 | Upstream-Status: Pending | ||
24 | 20 | ||
25 | libmultipath/blacklist.c | 10 +++++----- | 21 | Rebase to 0.9.8 |
26 | 1 file changed, 5 insertions(+), 5 deletions(-) | 22 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
23 | --- | ||
24 | libmultipath/blacklist.c | 16 +++++----------- | ||
25 | 1 file changed, 5 insertions(+), 11 deletions(-) | ||
27 | 26 | ||
28 | diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c | 27 | diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c |
29 | index 8d15d2ea..820b0d68 100644 | 28 | index 75100b20..4fdaca76 100644 |
30 | --- a/libmultipath/blacklist.c | 29 | --- a/libmultipath/blacklist.c |
31 | +++ b/libmultipath/blacklist.c | 30 | +++ b/libmultipath/blacklist.c |
32 | @@ -198,9 +198,6 @@ setup_default_blist (struct config * conf) | 31 | @@ -221,15 +221,6 @@ setup_default_blist (struct config * conf) |
33 | struct hwentry *hwe; | 32 | struct hwentry *hwe; |
34 | int i; | 33 | int i; |
35 | 34 | ||
36 | - if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", ORIGIN_DEFAULT)) | 35 | - if (nvme_multipath_enabled()) { |
37 | - return 1; | 36 | - if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z])", |
38 | - | 37 | - ORIGIN_DEFAULT)) |
38 | - return 1; | ||
39 | - } else { | ||
40 | - if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", | ||
41 | - ORIGIN_DEFAULT)) | ||
42 | - return 1; | ||
43 | - } | ||
39 | if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT)) | 44 | if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT)) |
40 | return 1; | 45 | return 1; |
41 | 46 | ||
42 | @@ -435,8 +432,11 @@ filter_property(const struct config *conf, struct udev_device *udev, | 47 | @@ -464,8 +455,11 @@ filter_property(const struct config *conf, struct udev_device *udev, |
43 | r = MATCH_NOTHING; | 48 | r = MATCH_NOTHING; |
44 | } | 49 | } |
45 | 50 | ||
@@ -54,5 +59,5 @@ index 8d15d2ea..820b0d68 100644 | |||
54 | 59 | ||
55 | static void free_ble(struct blentry *ble) | 60 | static void free_ble(struct blentry *ble) |
56 | -- | 61 | -- |
57 | 2.38.1 | 62 | 2.25.1 |
58 | 63 | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch index 840b00093..54b3bdc86 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch | |||
@@ -1,10 +1,7 @@ | |||
1 | From 056fdaece0f1a3a5ca92e8c08912730faa89875d Mon Sep 17 00:00:00 2001 | 1 | From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Fri, 23 Nov 2018 17:25:15 +0800 | 3 | Date: Fri, 23 Nov 2018 17:25:15 +0800 |
4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 | 4 | Subject: [PATCH 03/12] RH: don't start without a config file |
5 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 15 | ||
6 | Oct 2014 10:39:30 -0500 Subject: [PATCH] RH: don't start without a config | ||
7 | file | ||
8 | 5 | ||
9 | If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist | 6 | If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist |
10 | all devices when running multipath. A completely blank configuration file | 7 | all devices when running multipath. A completely blank configuration file |
@@ -17,20 +14,21 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | |||
17 | 14 | ||
18 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
19 | 16 | ||
20 | update this patch to new version | ||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
22 | [OP: Rebase to 0.9.3] | 17 | [OP: Rebase to 0.9.3] |
23 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | 18 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
19 | |||
20 | Rebase to 0.9.8 | ||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
24 | --- | 22 | --- |
25 | libmultipath/config.c | 18 ++++++++++++++++++ | 23 | libmultipath/config.c | 18 ++++++++++++++++++ |
26 | libmultipath/config.h | 1 + | 24 | libmultipath/config.h | 1 + |
27 | multipath/multipath.rules.in | 1 + | 25 | multipath/multipath.rules.in | 1 + |
28 | multipathd/multipathd.8 | 2 ++ | 26 | multipathd/multipathd.8.in | 2 ++ |
29 | multipathd/multipathd.service | 1 + | 27 | multipathd/multipathd.service.in | 1 + |
30 | 5 files changed, 23 insertions(+) | 28 | 5 files changed, 23 insertions(+) |
31 | 29 | ||
32 | diff --git a/libmultipath/config.c b/libmultipath/config.c | 30 | diff --git a/libmultipath/config.c b/libmultipath/config.c |
33 | index 5c5c0726..31894810 100644 | 31 | index 83fa7369..8a3a8f37 100644 |
34 | --- a/libmultipath/config.c | 32 | --- a/libmultipath/config.c |
35 | +++ b/libmultipath/config.c | 33 | +++ b/libmultipath/config.c |
36 | @@ -26,6 +26,7 @@ | 34 | @@ -26,6 +26,7 @@ |
@@ -41,7 +39,7 @@ index 5c5c0726..31894810 100644 | |||
41 | 39 | ||
42 | /* | 40 | /* |
43 | * We don't support re-initialization after | 41 | * We don't support re-initialization after |
44 | @@ -966,6 +967,23 @@ int _init_config (const char *file, struct config *conf) | 42 | @@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf) |
45 | } | 43 | } |
46 | factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); | 44 | factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); |
47 | validate_pctable(conf->overrides, 0, file); | 45 | validate_pctable(conf->overrides, 0, file); |
@@ -66,7 +64,7 @@ index 5c5c0726..31894810 100644 | |||
66 | 64 | ||
67 | conf->processed_main_config = 1; | 65 | conf->processed_main_config = 1; |
68 | diff --git a/libmultipath/config.h b/libmultipath/config.h | 66 | diff --git a/libmultipath/config.h b/libmultipath/config.h |
69 | index 87947469..0dc89c16 100644 | 67 | index 384193ab..158cebf0 100644 |
70 | --- a/libmultipath/config.h | 68 | --- a/libmultipath/config.h |
71 | +++ b/libmultipath/config.h | 69 | +++ b/libmultipath/config.h |
72 | @@ -10,6 +10,7 @@ | 70 | @@ -10,6 +10,7 @@ |
@@ -78,7 +76,7 @@ index 87947469..0dc89c16 100644 | |||
78 | enum devtypes { | 76 | enum devtypes { |
79 | DEV_NONE, | 77 | DEV_NONE, |
80 | diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in | 78 | diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in |
81 | index 8d3cf33a..5c4447a2 100644 | 79 | index 780bf852..2c518378 100644 |
82 | --- a/multipath/multipath.rules.in | 80 | --- a/multipath/multipath.rules.in |
83 | +++ b/multipath/multipath.rules.in | 81 | +++ b/multipath/multipath.rules.in |
84 | @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" | 82 | @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" |
@@ -89,11 +87,11 @@ index 8d3cf33a..5c4447a2 100644 | |||
89 | 87 | ||
90 | ENV{DEVTYPE}!="partition", GOTO="test_dev" | 88 | ENV{DEVTYPE}!="partition", GOTO="test_dev" |
91 | IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" | 89 | IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" |
92 | diff --git a/multipathd/multipathd.8 b/multipathd/multipathd.8 | 90 | diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in |
93 | index bdf102eb..a16a0bd5 100644 | 91 | index f1cab3ff..5ae21db1 100644 |
94 | --- a/multipathd/multipathd.8 | 92 | --- a/multipathd/multipathd.8.in |
95 | +++ b/multipathd/multipathd.8 | 93 | +++ b/multipathd/multipathd.8.in |
96 | @@ -48,6 +48,8 @@ map regains its maximum performance and redundancy. | 94 | @@ -49,6 +49,8 @@ map regains its maximum performance and redundancy. |
97 | With the \fB-k\fR option, \fBmultipathd\fR acts as a client utility that | 95 | With the \fB-k\fR option, \fBmultipathd\fR acts as a client utility that |
98 | sends commands to a running instance of the multipathd daemon (see | 96 | sends commands to a running instance of the multipathd daemon (see |
99 | \fBCOMMANDS\fR below). | 97 | \fBCOMMANDS\fR below). |
@@ -102,18 +100,18 @@ index bdf102eb..a16a0bd5 100644 | |||
102 | . | 100 | . |
103 | . | 101 | . |
104 | .\" ---------------------------------------------------------------------------- | 102 | .\" ---------------------------------------------------------------------------- |
105 | diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service | 103 | diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in |
106 | index aec62dbb..ab7585de 100644 | 104 | index 6d03ff71..0cd85102 100644 |
107 | --- a/multipathd/multipathd.service | 105 | --- a/multipathd/multipathd.service.in |
108 | +++ b/multipathd/multipathd.service | 106 | +++ b/multipathd/multipathd.service.in |
109 | @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target | 107 | @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target |
110 | Wants=systemd-udevd-kernel.socket | 108 | Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@ |
111 | After=systemd-udevd-kernel.socket | 109 | After=systemd-udevd-kernel.socket @MODPROBE_UNIT@ |
112 | After=multipathd.socket systemd-remount-fs.service | 110 | After=multipathd.socket systemd-remount-fs.service |
113 | +ConditionPathExists=/etc/multipath.conf | 111 | +ConditionPathExists=/etc/multipath.conf |
114 | Before=initrd-cleanup.service | 112 | Before=initrd-cleanup.service |
115 | DefaultDependencies=no | 113 | DefaultDependencies=no |
116 | Conflicts=shutdown.target | 114 | Conflicts=shutdown.target |
117 | -- | 115 | -- |
118 | 2.38.1 | 116 | 2.25.1 |
119 | 117 | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch new file mode 100644 index 000000000..91477a44c --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 26 Nov 2018 09:19:17 +0800 | ||
4 | Subject: [PATCH 04/12] RH: use rpm optflags if present | ||
5 | |||
6 | Use the passed in optflags when compiling as an RPM, and keep the | ||
7 | default flags as close as possible to the current fedora flags, while | ||
8 | still being generic. | ||
9 | |||
10 | Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | [OP: Rebase to 0.9.3] | ||
15 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
16 | |||
17 | Rebase to 0.9.8 | ||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | --- | ||
20 | Makefile.inc | 12 ++++++++++-- | ||
21 | 1 file changed, 10 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/Makefile.inc b/Makefile.inc | ||
24 | index de89b21f..6ac632ff 100644 | ||
25 | --- a/Makefile.inc | ||
26 | +++ b/Makefile.inc | ||
27 | @@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo | ||
28 | MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ | ||
29 | echo "modprobe@dm_multipath.service") | ||
30 | |||
31 | -OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | ||
32 | +ifndef RPM_OPT_FLAGS | ||
33 | + OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | ||
34 | +else | ||
35 | + OPTFLAGS = $(RPM_OPT_FLAGS) | ||
36 | +endif | ||
37 | +OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=0 -Werror=implicit-int \ | ||
38 | + -Werror=implicit-function-declaration -Wno-sign-compare \ | ||
39 | + -Wno-unused-parameter -Werror=cast-qual \ | ||
40 | + -Werror=discarded-qualifiers | ||
41 | WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ | ||
42 | -Werror=implicit-function-declaration -Werror=format-security \ | ||
43 | $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) | ||
44 | @@ -105,7 +113,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ | ||
45 | -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ | ||
46 | -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ | ||
47 | -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP | ||
48 | -CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe | ||
49 | +CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe | ||
50 | BIN_CFLAGS := -fPIE -DPIE | ||
51 | LIB_CFLAGS := -fPIC | ||
52 | SHARED_FLAGS := -shared | ||
53 | -- | ||
54 | 2.25.1 | ||
55 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch index 471ff0932..c6089612b 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch | |||
@@ -1,9 +1,7 @@ | |||
1 | From b0b4cca566e3e0c3a232b3754555c41d4e0c1273 Mon Sep 17 00:00:00 2001 | 1 | From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 26 Nov 2018 09:55:12 +0800 | 3 | Date: Mon, 26 Nov 2018 09:55:12 +0800 |
4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 | 4 | Subject: [PATCH 05/12] RH: add mpathconf |
5 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Thu, 16 | ||
6 | Oct 2014 15:49:01 -0500 Subject: [PATCH] RH: add mpathconf | ||
7 | 5 | ||
8 | mpathconf is a program (largely based on lvmcomf) to help users | 6 | mpathconf is a program (largely based on lvmcomf) to help users |
9 | configure /etc/multipath.conf and enable or disable multipathing. It | 7 | configure /etc/multipath.conf and enable or disable multipathing. It |
@@ -16,11 +14,11 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | |||
16 | 14 | ||
17 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
18 | 16 | ||
19 | update this patch to new version | ||
20 | |||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
22 | [OP: Rebase to 0.9.3] | 17 | [OP: Rebase to 0.9.3] |
23 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | 18 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
19 | |||
20 | Rebase to 0.9.8 | ||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
24 | --- | 22 | --- |
25 | libmultipath/config.c | 1 + | 23 | libmultipath/config.c | 1 + |
26 | multipath/Makefile | 4 + | 24 | multipath/Makefile | 4 + |
@@ -31,10 +29,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | |||
31 | create mode 100644 multipath/mpathconf.8 | 29 | create mode 100644 multipath/mpathconf.8 |
32 | 30 | ||
33 | diff --git a/libmultipath/config.c b/libmultipath/config.c | 31 | diff --git a/libmultipath/config.c b/libmultipath/config.c |
34 | index 31894810..af59dd3c 100644 | 32 | index 8a3a8f37..a40b41ab 100644 |
35 | --- a/libmultipath/config.c | 33 | --- a/libmultipath/config.c |
36 | +++ b/libmultipath/config.c | 34 | +++ b/libmultipath/config.c |
37 | @@ -969,6 +969,7 @@ int _init_config (const char *file, struct config *conf) | 35 | @@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf) |
38 | validate_pctable(conf->overrides, 0, file); | 36 | validate_pctable(conf->overrides, 0, file); |
39 | } else { | 37 | } else { |
40 | condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); | 38 | condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); |
@@ -43,36 +41,36 @@ index 31894810..af59dd3c 100644 | |||
43 | conf->blist_devnode = vector_alloc(); | 41 | conf->blist_devnode = vector_alloc(); |
44 | if (!conf->blist_devnode) { | 42 | if (!conf->blist_devnode) { |
45 | diff --git a/multipath/Makefile b/multipath/Makefile | 43 | diff --git a/multipath/Makefile b/multipath/Makefile |
46 | index 8482de6a..780b1b73 100644 | 44 | index 2ea9e528..6b1fa09e 100644 |
47 | --- a/multipath/Makefile | 45 | --- a/multipath/Makefile |
48 | +++ b/multipath/Makefile | 46 | +++ b/multipath/Makefile |
49 | @@ -21,6 +21,7 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so | 47 | @@ -24,6 +24,7 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so |
50 | install: | 48 | install: |
51 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) | 49 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
52 | $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ | 50 | $(Q)$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
53 | + $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ | 51 | + $(Q)$(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ |
54 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) | 52 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) |
55 | $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) | 53 | $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) |
56 | $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules | 54 | $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) |
57 | @@ -32,6 +33,7 @@ install: | 55 | @@ -34,6 +35,7 @@ install: |
58 | $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir) | 56 | $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/man8 |
59 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) | 57 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man5 |
60 | $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) | 58 | $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(mandir)/man5 |
61 | + $(INSTALL_PROGRAM) -m 644 mpathconf.8 $(DESTDIR)$(man8dir) | 59 | + $(Q)$(INSTALL_PROGRAM) -m 644 mpathconf.8 $(DESTDIR)$(mandir)/man8 |
62 | ifneq ($(SCSI_DH_MODULES_PRELOAD),) | 60 | $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) |
63 | $(INSTALL_PROGRAM) -m 644 scsi_dh.conf $(DESTDIR)$(modulesloaddir)/scsi_dh.conf | 61 | ifeq ($(MODPROBE_UNIT),) |
64 | for _x in $(SCSI_DH_MODULES_PRELOAD); do echo "$$_x"; done \ | 62 | $(Q)$(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf |
65 | @@ -44,8 +46,10 @@ uninstall: | 63 | @@ -51,8 +53,10 @@ uninstall: |
66 | $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf | 64 | $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf |
67 | $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf | 65 | $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf |
68 | $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules | 66 | $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules |
69 | + $(RM) $(DESTDIR)$(bindir)/mpathconf | 67 | + $(Q)$(RM) $(DESTDIR)$(bindir)/mpathconf |
70 | $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 | 68 | $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 |
71 | $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5 | 69 | $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 |
72 | + $(RM) $(DESTDIR)$(man8dir)/mpathconf.8 | 70 | + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/mpathconf.8 |
71 | $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf | ||
73 | 72 | ||
74 | clean: dep_clean | 73 | clean: dep_clean |
75 | $(RM) core *.o $(EXEC) multipath.rules tmpfiles.conf | ||
76 | diff --git a/multipath/mpathconf b/multipath/mpathconf | 74 | diff --git a/multipath/mpathconf b/multipath/mpathconf |
77 | new file mode 100644 | 75 | new file mode 100644 |
78 | index 00000000..e8391347 | 76 | index 00000000..e8391347 |
@@ -651,5 +649,5 @@ index 00000000..4cd32672 | |||
651 | +.SH AUTHOR | 649 | +.SH AUTHOR |
652 | +Benjamin Marzinski <bmarzins@redhat.com> | 650 | +Benjamin Marzinski <bmarzins@redhat.com> |
653 | -- | 651 | -- |
654 | 2.38.1 | 652 | 2.25.1 |
655 | 653 | ||
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/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 17c36e86c..8df7de3b4 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/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch | |||
@@ -1,14 +1,7 @@ | |||
1 | From 262de33671ede81e424344ea9125d9e546cf8612 Mon Sep 17 00:00:00 2001 | 1 | From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 26 Sep 2019 16:29:48 +0800 | 3 | Date: Thu, 26 Sep 2019 16:29:48 +0800 |
4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep | 4 | Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A |
5 | |||
6 | 17 | ||
7 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, | ||
8 | 17 | ||
9 | Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel | ||
10 | cmdline | ||
11 | mpath.wwids with -A | ||
12 | 5 | ||
13 | This patch adds another option to multipath, "-A", which reads | 6 | This patch adds another option to multipath, "-A", which reads |
14 | /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds | 7 | /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds |
@@ -23,21 +16,21 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | |||
23 | 16 | ||
24 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
25 | 18 | ||
26 | Update this patch to new version 0.8.2 | ||
27 | |||
28 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
29 | [OP: Rebase to 0.9.3] | 19 | [OP: Rebase to 0.9.3] |
30 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | 20 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
21 | |||
22 | Rebase to 0.9.8 | ||
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
31 | --- | 24 | --- |
32 | libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ | 25 | libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ |
33 | libmultipath/wwids.h | 1 + | 26 | libmultipath/wwids.h | 1 + |
34 | 2 files changed, 45 insertions(+) | 27 | 2 files changed, 45 insertions(+) |
35 | 28 | ||
36 | diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c | 29 | diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c |
37 | index 89bb60ca..bab9aa85 100644 | 30 | index 591cd09b..b01f1b85 100644 |
38 | --- a/libmultipath/wwids.c | 31 | --- a/libmultipath/wwids.c |
39 | +++ b/libmultipath/wwids.c | 32 | +++ b/libmultipath/wwids.c |
40 | @@ -451,3 +451,47 @@ int unmark_failed_wwid(const char *wwid) | 33 | @@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid) |
41 | print_failed_wwid_result("unmark_failed", wwid, r); | 34 | print_failed_wwid_result("unmark_failed", wwid, r); |
42 | return r; | 35 | return r; |
43 | } | 36 | } |
@@ -98,5 +91,5 @@ index 0c6ee54d..e32a0b0e 100644 | |||
98 | enum { | 91 | enum { |
99 | WWID_IS_NOT_FAILED = 0, | 92 | WWID_IS_NOT_FAILED = 0, |
100 | -- | 93 | -- |
101 | 2.38.1 | 94 | 2.25.1 |
102 | 95 | ||
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/0007-RH-warn-on-invalid-regex-instead-of-failing.patch index 22cb4beeb..c64b8aeab 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/0007-RH-warn-on-invalid-regex-instead-of-failing.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 | 1 | From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 |
2 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | 2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of | 3 | Date: Fri, 1 Mar 2024 11:45:10 +0800 |
4 | failing | 4 | Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing |
5 | 5 | ||
6 | multipath.conf used to allow "*" as a match everything regular expression, | 6 | multipath.conf used to allow "*" as a match everything regular expression, |
7 | instead of requiring ".*". Instead of erroring when the old style | 7 | instead of requiring ".*". Instead of erroring when the old style |
@@ -12,21 +12,21 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | |||
12 | 12 | ||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | 14 | ||
15 | update this patch to 0.8.2 | ||
16 | |||
17 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
18 | [OP: Rebase to 0.9.3] | 15 | [OP: Rebase to 0.9.3] |
19 | [OP: adjusted FREE() -> free(), made set_regex_value() static] | 16 | [OP: adjusted FREE() -> free(), made set_regex_value() static] |
20 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | 17 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
18 | |||
19 | Rebase to 0.9.8 | ||
20 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
21 | --- | 21 | --- |
22 | libmultipath/dict.c | 42 +++++++++++++++++++++++++++++++++++------- | 22 | libmultipath/dict.c | 40 ++++++++++++++++++++++++++++++++++------ |
23 | 1 file changed, 35 insertions(+), 7 deletions(-) | 23 | 1 file changed, 34 insertions(+), 6 deletions(-) |
24 | 24 | ||
25 | diff --git a/libmultipath/dict.c b/libmultipath/dict.c | 25 | diff --git a/libmultipath/dict.c b/libmultipath/dict.c |
26 | index aa93fe43..55a22d32 100644 | 26 | index 5af036b7..e494419d 100644 |
27 | --- a/libmultipath/dict.c | 27 | --- a/libmultipath/dict.c |
28 | +++ b/libmultipath/dict.c | 28 | +++ b/libmultipath/dict.c |
29 | @@ -155,6 +155,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) | 29 | @@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) |
30 | return 0; | 30 | return 0; |
31 | } | 31 | } |
32 | 32 | ||
@@ -61,18 +61,16 @@ index aa93fe43..55a22d32 100644 | |||
61 | static int | 61 | static int |
62 | set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) | 62 | set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) |
63 | { | 63 | { |
64 | @@ -1679,8 +1707,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ | 64 | @@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ |
65 | \ | ||
66 | if (!conf->option) \ | 65 | if (!conf->option) \ |
67 | return 1; \ | 66 | return 1; \ |
68 | - \ | 67 | \ |
69 | - buff = set_value(strvec); \ | 68 | - buff = set_value(strvec); \ |
70 | + \ | ||
71 | + buff = set_regex_value(strvec); \ | 69 | + buff = set_regex_value(strvec); \ |
72 | if (!buff) \ | 70 | if (!buff) \ |
73 | return 1; \ | 71 | return 1; \ |
74 | \ | 72 | \ |
75 | @@ -1700,7 +1728,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ | 73 | @@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ |
76 | if (!conf->option) \ | 74 | if (!conf->option) \ |
77 | return 1; \ | 75 | return 1; \ |
78 | \ | 76 | \ |
@@ -81,7 +79,7 @@ index aa93fe43..55a22d32 100644 | |||
81 | if (!buff) \ | 79 | if (!buff) \ |
82 | return 1; \ | 80 | return 1; \ |
83 | \ | 81 | \ |
84 | @@ -1806,16 +1834,16 @@ device_handler(struct config *conf, vector strvec, const char *file, | 82 | @@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, |
85 | return 0; | 83 | return 0; |
86 | } | 84 | } |
87 | 85 | ||
@@ -101,7 +99,7 @@ index aa93fe43..55a22d32 100644 | |||
101 | +declare_hw_handler(bl_product, set_regex) | 99 | +declare_hw_handler(bl_product, set_regex) |
102 | declare_hw_snprint(bl_product, print_str) | 100 | declare_hw_snprint(bl_product, print_str) |
103 | 101 | ||
104 | declare_hw_handler(hwhandler, set_str) | 102 | declare_hw_arg_str_handler(hwhandler, 0) |
105 | -- | 103 | -- |
106 | 2.38.1 | 104 | 2.25.1 |
107 | 105 | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0028-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch index ad03b8acc..1fa1f3be2 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0028-RH-reset-default-find_mutipaths-value-to-off.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch | |||
@@ -1,10 +1,7 @@ | |||
1 | From 16900150e02e5b367a8b33621b393975ad011130 Mon Sep 17 00:00:00 2001 | 1 | From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 26 Nov 2018 11:12:01 +0800 | 3 | Date: Mon, 26 Nov 2018 11:12:01 +0800 |
4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 | 4 | Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off |
5 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Thu, 7 Jun | ||
6 | 2018 17:43:52 -0500 Subject: [PATCH] RH: reset default find_mutipaths value | ||
7 | to off | ||
8 | 5 | ||
9 | Upstream has changed to default find_multipaths to "strict". For now | 6 | Upstream has changed to default find_multipaths to "strict". For now |
10 | Redhat will retain the previous default of "off". | 7 | Redhat will retain the previous default of "off". |
@@ -13,18 +10,17 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | |||
13 | 10 | ||
14 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
15 | 12 | ||
16 | Update this patch to new version | 13 | Rebase to 0.9.8 |
17 | |||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
19 | --- | 15 | --- |
20 | libmultipath/defaults.h | 2 +- | 16 | libmultipath/defaults.h | 2 +- |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
22 | 18 | ||
23 | diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h | 19 | diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h |
24 | index 6576939..a2404b2 100644 | 20 | index 64b633f2..a06a8a41 100644 |
25 | --- a/libmultipath/defaults.h | 21 | --- a/libmultipath/defaults.h |
26 | +++ b/libmultipath/defaults.h | 22 | +++ b/libmultipath/defaults.h |
27 | @@ -17,7 +17,7 @@ | 23 | @@ -23,7 +23,7 @@ |
28 | #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF | 24 | #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF |
29 | #define DEFAULT_VERBOSITY 2 | 25 | #define DEFAULT_VERBOSITY 2 |
30 | #define DEFAULT_REASSIGN_MAPS 0 | 26 | #define DEFAULT_REASSIGN_MAPS 0 |
@@ -34,5 +30,5 @@ index 6576939..a2404b2 100644 | |||
34 | #define DEFAULT_DEV_LOSS_TMO 600 | 30 | #define DEFAULT_DEV_LOSS_TMO 600 |
35 | #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON | 31 | #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON |
36 | -- | 32 | -- |
37 | 2.7.4 | 33 | 2.25.1 |
38 | 34 | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch new file mode 100644 index 000000000..041b79a9a --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 4 Jun 2019 11:39:39 +0800 | ||
4 | Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for | ||
5 | cross-compilation | ||
6 | |||
7 | Do not look for systemd info on the host, and allow us to pass in CFLAGS | ||
8 | using the OPTFLAGS variable. | ||
9 | |||
10 | Upstream-Status: Inappropriate [embedded specific] | ||
11 | |||
12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
13 | |||
14 | [OP: Rebase to 0.9.3] | ||
15 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
16 | |||
17 | Rebase to 0.9.8 | ||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | --- | ||
20 | create-config.mk | 4 ---- | ||
21 | 1 file changed, 4 deletions(-) | ||
22 | |||
23 | diff --git a/create-config.mk b/create-config.mk | ||
24 | index 4d318b96..a65975ba 100644 | ||
25 | --- a/create-config.mk | ||
26 | +++ b/create-config.mk | ||
27 | @@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) | ||
28 | DEFINES += -DNO_DMEVENTS_POLL | ||
29 | endif | ||
30 | |||
31 | -SYSTEMD := $(strip $(or $(shell $(PKG_CONFIG) --modversion libsystemd 2>/dev/null | awk '{print $$1}'), \ | ||
32 | - $(shell systemctl --version 2>/dev/null | sed -n 's/systemd \([0-9]*\).*/\1/p'))) | ||
33 | - | ||
34 | - | ||
35 | # $(call TEST_CC_OPTION,option,fallback) | ||
36 | # Test if the C compiler supports the option. | ||
37 | # Evaluates to "option" if yes, and "fallback" otherwise. | ||
38 | -- | ||
39 | 2.25.1 | ||
40 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch new file mode 100644 index 000000000..b48720b8a --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 26 Nov 2018 11:17:41 +0800 | ||
4 | Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper | ||
5 | |||
6 | Do not try to compute several _API_ make variables | ||
7 | from host information when cross-compiling. | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> | ||
12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
13 | |||
14 | [OP: Rebase to 0.9.3] | ||
15 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
16 | |||
17 | Rebase to 0.9.8 | ||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | --- | ||
20 | create-config.mk | 36 ++++++++---------------------------- | ||
21 | 1 file changed, 8 insertions(+), 28 deletions(-) | ||
22 | |||
23 | diff --git a/create-config.mk b/create-config.mk | ||
24 | index a65975ba..8ba592f4 100644 | ||
25 | --- a/create-config.mk | ||
26 | +++ b/create-config.mk | ||
27 | @@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ | ||
28 | |||
29 | DEFINES := | ||
30 | |||
31 | -ifneq ($(call check_func,dm_task_no_flush,$(devmapper_incdir)/libdevmapper.h),0) | ||
32 | - DEFINES += LIBDM_API_FLUSH | ||
33 | -endif | ||
34 | - | ||
35 | -ifneq ($(call check_func,dm_task_get_errno,$(devmapper_incdir)/libdevmapper.h),0) | ||
36 | - DEFINES += LIBDM_API_GET_ERRNO | ||
37 | -endif | ||
38 | - | ||
39 | -ifneq ($(call check_func,dm_task_set_cookie,$(devmapper_incdir)/libdevmapper.h),0) | ||
40 | - DEFINES += LIBDM_API_COOKIE | ||
41 | -endif | ||
42 | - | ||
43 | -ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(libudev_incdir)/libudev.h),0) | ||
44 | - DEFINES += LIBUDEV_API_RECVBUF | ||
45 | -endif | ||
46 | - | ||
47 | -ifneq ($(call check_func,dm_task_deferred_remove,$(devmapper_incdir)/libdevmapper.h),0) | ||
48 | - DEFINES += LIBDM_API_DEFERRED | ||
49 | -endif | ||
50 | - | ||
51 | -ifneq ($(call check_func,dm_hold_control_dev,$(devmapper_incdir)/libdevmapper.h),0) | ||
52 | - DEFINES += LIBDM_API_HOLD_CONTROL | ||
53 | -endif | ||
54 | - | ||
55 | -ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(kernel_incdir)/scsi/fc/fc_els.h),0) | ||
56 | - DEFINES += FPIN_EVENT_HANDLER | ||
57 | - FPIN_SUPPORT = 1 | ||
58 | -endif | ||
59 | +DEFINES += LIBDM_API_FLUSH | ||
60 | +DEFINES += LIBDM_API_GET_ERRNO | ||
61 | +DEFINES += LIBDM_API_COOKIE | ||
62 | +DEFINES += LIBUDEV_API_RECVBUF | ||
63 | +DEFINES += LIBDM_API_DEFERRED | ||
64 | +DEFINES += LIBDM_API_HOLD_CONTROL | ||
65 | +DEFINES += FPIN_EVENT_HANDLER | ||
66 | +FPIN_SUPPORT = 1 | ||
67 | |||
68 | libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h | ||
69 | ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0) | ||
70 | -- | ||
71 | 2.25.1 | ||
72 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch index bc07d75cc..f32d789b0 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 51f1f351262a31d94c10504e4d135526c6a7caeb Mon Sep 17 00:00:00 2001 | 1 | From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001 |
2 | From: Wang Mingyu <wangmy@cn.fujitsu.com> | 2 | From: Wang Mingyu <wangmy@cn.fujitsu.com> |
3 | Date: Sun, 10 May 2020 21:22:53 +0800 | 3 | Date: Sun, 10 May 2020 21:22:53 +0800 |
4 | Subject: [PATCH] fix bug of do_compile and do_install | 4 | Subject: [PATCH 11/12] fix bug of do_compile and do_install |
5 | 5 | ||
6 | when multiple processes make run in parallel, | 6 | when multiple processes make run in parallel, |
7 | because of dependency error will occur. | 7 | because of dependency error will occur. |
@@ -12,16 +12,14 @@ Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> | |||
12 | [OP: Drop dependencies that are already present in the 0.9.3 Makefile] | 12 | [OP: Drop dependencies that are already present in the 0.9.3 Makefile] |
13 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | 13 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
14 | --- | 14 | --- |
15 | Upstream-Status: Pending | ||
16 | |||
17 | Makefile | 10 ++++++++++ | 15 | Makefile | 10 ++++++++++ |
18 | 1 file changed, 10 insertions(+) | 16 | 1 file changed, 10 insertions(+) |
19 | 17 | ||
20 | diff --git a/Makefile b/Makefile | 18 | diff --git a/Makefile b/Makefile |
21 | index 27b4641f..f195b570 100644 | 19 | index 4df5f161..065249c2 100644 |
22 | --- a/Makefile | 20 | --- a/Makefile |
23 | +++ b/Makefile | 21 | +++ b/Makefile |
24 | @@ -79,6 +79,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath | 22 | @@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath |
25 | libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath | 23 | libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath |
26 | mpathpersist multipathd: libmpathpersist | 24 | mpathpersist multipathd: libmpathpersist |
27 | 25 | ||
@@ -39,5 +37,5 @@ index 27b4641f..f195b570 100644 | |||
39 | libmultipath/prioritizers.install \ | 37 | libmultipath/prioritizers.install \ |
40 | libmultipath/foreign.install: libmultipath.install | 38 | libmultipath/foreign.install: libmultipath.install |
41 | -- | 39 | -- |
42 | 2.38.1 | 40 | 2.25.1 |
43 | 41 | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch index 3b0a70448..2f774940d 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ee9f7b6e764be5668bc958f8bb97a46e5056d050 Mon Sep 17 00:00:00 2001 | 1 | From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Mon, 25 May 2020 23:22:55 -0700 | 3 | Date: Mon, 25 May 2020 23:22:55 -0700 |
4 | Subject: [PATCH] add explicit dependency on libraries | 4 | Subject: [PATCH 12/12] add explicit dependency on libraries |
5 | 5 | ||
6 | [snip] | 6 | [snip] |
7 | gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist | 7 | gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist |
@@ -24,10 +24,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | |||
24 | 1 file changed, 1 insertion(+) | 24 | 1 file changed, 1 insertion(+) |
25 | 25 | ||
26 | diff --git a/Makefile b/Makefile | 26 | diff --git a/Makefile b/Makefile |
27 | index f195b570..2d22881c 100644 | 27 | index 065249c2..0444c2ea 100644 |
28 | --- a/Makefile | 28 | --- a/Makefile |
29 | +++ b/Makefile | 29 | +++ b/Makefile |
30 | @@ -78,6 +78,7 @@ libmultipath: libmpathutil | 30 | @@ -90,6 +90,7 @@ libmultipath: libmpathutil |
31 | libmpathpersist libmpathvalid multipath multipathd: libmultipath | 31 | libmpathpersist libmpathvalid multipath multipathd: libmultipath |
32 | libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath | 32 | libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath |
33 | mpathpersist multipathd: libmpathpersist | 33 | mpathpersist multipathd: libmpathpersist |
@@ -36,5 +36,5 @@ index f195b570..2d22881c 100644 | |||
36 | DEPS_ON_MULTIPATH := \ | 36 | DEPS_ON_MULTIPATH := \ |
37 | multipath \ | 37 | multipath \ |
38 | -- | 38 | -- |
39 | 2.38.1 | 39 | 2.25.1 |
40 | 40 | ||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch deleted file mode 100644 index 395f9a9b0..000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From 9a941729d3c0d19d30d65e16b291c380e589eeb3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Benjamin Marzinski <bmarzins@redhat.com> | ||
3 | Date: Thu, 13 Apr 2017 07:22:23 -0500 | ||
4 | Subject: [PATCH] RH: fixup udev rules for redhat | ||
5 | |||
6 | The multipath rules need to run after scsi_id is run. This means moving | ||
7 | them after 60-persistent-storage.rules for redhat. Redhat also uses a | ||
8 | different naming scheme for partitions than SuSE. Also, there are some | ||
9 | false warnings that gcc throws because of the changed options. Fix these | ||
10 | too. | ||
11 | |||
12 | Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | ||
13 | |||
14 | Update patch to 0.8.0 | ||
15 | |||
16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
17 | [OP: Rebase to 0.9.3] | ||
18 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
19 | --- | ||
20 | Upstream-Status: Pending | ||
21 | |||
22 | Makefile.inc | 2 +- | ||
23 | kpartx/kpartx.rules | 2 +- | ||
24 | multipath/Makefile | 4 ++-- | ||
25 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
26 | |||
27 | diff --git a/Makefile.inc b/Makefile.inc | ||
28 | index 4d843ce5..57779fd8 100644 | ||
29 | --- a/Makefile.inc | ||
30 | +++ b/Makefile.inc | ||
31 | @@ -81,7 +81,7 @@ endif | ||
32 | prefix = | ||
33 | exec_prefix = $(prefix) | ||
34 | usr_prefix = $(prefix) | ||
35 | -bindir = $(exec_prefix)/sbin | ||
36 | +bindir = $(exec_prefix)/usr/sbin | ||
37 | libudevdir = $(prefix)/$(SYSTEMDPATH)/udev | ||
38 | tmpfilesdir = $(prefix)/$(SYSTEMDPATH)/tmpfiles.d | ||
39 | udevrulesdir = $(libudevdir)/rules.d | ||
40 | diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules | ||
41 | index 1969dee0..d2b28233 100644 | ||
42 | --- a/kpartx/kpartx.rules | ||
43 | +++ b/kpartx/kpartx.rules | ||
44 | @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" | ||
45 | GOTO="kpartx_end" | ||
46 | |||
47 | LABEL="run_kpartx" | ||
48 | -RUN+="/sbin/kpartx -un -p -part /dev/$name" | ||
49 | +RUN+="/sbin/kpartx -un /dev/$name" | ||
50 | |||
51 | LABEL="kpartx_end" | ||
52 | diff --git a/multipath/Makefile b/multipath/Makefile | ||
53 | index 116348e2..8482de6a 100644 | ||
54 | --- a/multipath/Makefile | ||
55 | +++ b/multipath/Makefile | ||
56 | @@ -23,7 +23,7 @@ install: | ||
57 | $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ | ||
58 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) | ||
59 | $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) | ||
60 | - $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules | ||
61 | + $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules | ||
62 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) | ||
63 | $(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf | ||
64 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) | ||
65 | @@ -43,7 +43,7 @@ uninstall: | ||
66 | $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules | ||
67 | $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf | ||
68 | $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf | ||
69 | - $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules | ||
70 | + $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules | ||
71 | $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 | ||
72 | $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5 | ||
73 | |||
74 | -- | ||
75 | 2.38.1 | ||
76 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch deleted file mode 100644 index e7b3e1223..000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From cc38276a5d3926fd96e58366e15ba887d7d02ed0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 26 Nov 2018 09:19:17 +0800 | ||
4 | Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep | ||
5 | |||
6 | 17 | ||
7 | 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, | ||
8 | 19 | ||
9 | Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if | ||
10 | present | ||
11 | |||
12 | Use the passed in optflags when compiling as an RPM, and keep the | ||
13 | default flags as close as possible to the current fedora flags, while | ||
14 | still being generic. | ||
15 | |||
16 | Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | update this patch to new version | ||
21 | |||
22 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
23 | [OP: Rebase to 0.9.3] | ||
24 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
25 | --- | ||
26 | Makefile.inc | 28 ++++++++++++++++++---------- | ||
27 | 1 file changed, 18 insertions(+), 10 deletions(-) | ||
28 | |||
29 | diff --git a/Makefile.inc b/Makefile.inc | ||
30 | index 57779fd8..34f2cc6d 100644 | ||
31 | --- a/Makefile.inc | ||
32 | +++ b/Makefile.inc | ||
33 | @@ -140,20 +140,28 @@ FORTIFY_OPT := $(shell \ | ||
34 | echo "-D_FORTIFY_SOURCE=2"; \ | ||
35 | fi) | ||
36 | |||
37 | -STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) | ||
38 | -ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) | ||
39 | -WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,) | ||
40 | -WFORMATOVERFLOW := $(call TEST_CC_OPTION,-Wformat-overflow=2,) | ||
41 | - | ||
42 | -OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | ||
43 | -WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ | ||
44 | - -Werror=implicit-function-declaration -Werror=format-security \ | ||
45 | - $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) | ||
46 | +ifndef RPM_OPT_FLAGS | ||
47 | + STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) | ||
48 | + OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ | ||
49 | + -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \ | ||
50 | + $(STACKPROT) --param=ssp-buffer-size=4 \ | ||
51 | + -grecord-gcc-switches | ||
52 | + ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1) | ||
53 | + OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 | ||
54 | + endif | ||
55 | +else | ||
56 | + OPTFLAGS = $(RPM_OPT_FLAGS) | ||
57 | +endif | ||
58 | +OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 -Werror=implicit-int \ | ||
59 | + -Werror=implicit-function-declaration -Wno-sign-compare \ | ||
60 | + -Wno-unused-parameter -Werror=cast-qual \ | ||
61 | + -Werror=discarded-qualifiers | ||
62 | + | ||
63 | CPPFLAGS := $(FORTIFY_OPT) \ | ||
64 | -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \ | ||
65 | -DRUNTIME_DIR=\"$(runtimedir)\" \ | ||
66 | -DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP | ||
67 | -CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe | ||
68 | +CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe | ||
69 | BIN_CFLAGS = -fPIE -DPIE | ||
70 | LIB_CFLAGS = -fPIC | ||
71 | SHARED_FLAGS = -shared | ||
72 | -- | ||
73 | 2.38.1 | ||
74 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch b/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch deleted file mode 100644 index 952009b1d..000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From d139474f2a6d87c1cd20dfbb916fe650bfcce968 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 4 Jun 2019 11:39:39 +0800 | ||
4 | Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation | ||
5 | |||
6 | Do not look for systemd info on the host, and allow us to pass in CFLAGS | ||
7 | using the OPTFLAGS variable. | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
12 | |||
13 | Update for version 0.5.0-144-g770e6d0 | ||
14 | |||
15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
16 | |||
17 | Update for version 0.7.1 | ||
18 | |||
19 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
20 | |||
21 | update for version 0.7.7 | ||
22 | |||
23 | remove change about CFLAGS part, since patch 0024 already have similar function. | ||
24 | |||
25 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
26 | |||
27 | update for version 0.8.1 | ||
28 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
29 | [OP: Rebase to 0.9.3] | ||
30 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
31 | --- | ||
32 | Makefile.inc | 11 ----------- | ||
33 | 1 file changed, 11 deletions(-) | ||
34 | |||
35 | diff --git a/Makefile.inc b/Makefile.inc | ||
36 | index 34f2cc6d..ee6a4c9f 100644 | ||
37 | --- a/Makefile.inc | ||
38 | +++ b/Makefile.inc | ||
39 | @@ -42,17 +42,6 @@ ifndef RUN | ||
40 | endif | ||
41 | endif | ||
42 | |||
43 | -ifndef SYSTEMD | ||
44 | - ifeq ($(shell $(PKGCONFIG) --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) | ||
45 | - SYSTEMD = $(shell $(PKGCONFIG) --modversion libsystemd | awk '{print $$1}') | ||
46 | - else | ||
47 | - ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) | ||
48 | - SYSTEMD = $(shell systemctl --version 2> /dev/null | \ | ||
49 | - sed -n 's/systemd \([0-9]*\).*/\1/p') | ||
50 | - endif | ||
51 | - endif | ||
52 | -endif | ||
53 | - | ||
54 | ifndef SYSTEMDPATH | ||
55 | SYSTEMDPATH=usr/lib | ||
56 | endif | ||
57 | -- | ||
58 | 2.38.1 | ||
59 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch deleted file mode 100644 index c2025ed6f..000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | From f20d7651a62efff818ebd0d1bc920f6f362c890d Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 26 Nov 2018 11:17:41 +0800 | ||
4 | Subject: [PATCH] Subject: [PATCH] Always use devmapper | ||
5 | |||
6 | Do not try to compute several _API_ make variables | ||
7 | from host information when cross-compiling. | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> | ||
12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
13 | |||
14 | Rebase to 0.7.1 | ||
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | |||
18 | Rebase to 0.7.7 | ||
19 | |||
20 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
21 | |||
22 | Rebase to 0.7.9 | ||
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
24 | [OP: Rebase to 0.9.3] | ||
25 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
26 | --- | ||
27 | libmultipath/Makefile | 34 +++++++--------------------------- | ||
28 | 1 file changed, 7 insertions(+), 27 deletions(-) | ||
29 | |||
30 | diff --git a/libmultipath/Makefile b/libmultipath/Makefile | ||
31 | index 3b60a525..72aca7ca 100644 | ||
32 | --- a/libmultipath/Makefile | ||
33 | +++ b/libmultipath/Makefile | ||
34 | @@ -22,33 +22,13 @@ ifdef SYSTEMD | ||
35 | endif | ||
36 | endif | ||
37 | |||
38 | -ifneq ($(call check_func,dm_task_no_flush,$(DEVMAPPER_INCDIR)/libdevmapper.h),0) | ||
39 | - CPPFLAGS += -DLIBDM_API_FLUSH | ||
40 | -endif | ||
41 | - | ||
42 | -ifneq ($(call check_func,dm_task_get_errno,$(DEVMAPPER_INCDIR)/libdevmapper.h),0) | ||
43 | - CPPFLAGS += -DLIBDM_API_GET_ERRNO | ||
44 | -endif | ||
45 | - | ||
46 | -ifneq ($(call check_func,dm_task_set_cookie,$(DEVMAPPER_INCDIR)/libdevmapper.h),0) | ||
47 | - CPPFLAGS += -DLIBDM_API_COOKIE | ||
48 | -endif | ||
49 | - | ||
50 | -ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(LIBUDEV_INCDIR)/libudev.h),0) | ||
51 | - CPPFLAGS += -DLIBUDEV_API_RECVBUF | ||
52 | -endif | ||
53 | - | ||
54 | -ifneq ($(call check_func,dm_task_deferred_remove,$(DEVMAPPER_INCDIR)/libdevmapper.h),0) | ||
55 | - CPPFLAGS += -DLIBDM_API_DEFERRED | ||
56 | -endif | ||
57 | - | ||
58 | -ifneq ($(call check_func,dm_hold_control_dev,$(DEVMAPPER_INCDIR)/libdevmapper.h),0) | ||
59 | - CPPFLAGS += -DLIBDM_API_HOLD_CONTROL | ||
60 | -endif | ||
61 | - | ||
62 | -ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(LINUX_HEADERS_INCDIR)/scsi/fc/fc_els.h),0) | ||
63 | - CPPFLAGS += -DFPIN_EVENT_HANDLER | ||
64 | -endif | ||
65 | +CPPFLAGS += -DLIBDM_API_FLUSH | ||
66 | +CPPFLAGS += -DLIBDM_API_GET_ERRNO | ||
67 | +CPPFLAGS += -DLIBDM_API_COOKIE | ||
68 | +CPPFLAGS += -DLIBUDEV_API_RECVBUF | ||
69 | +CPPFLAGS += -DLIBDM_API_DEFERRED | ||
70 | +CPPFLAGS += -DLIBDM_API_HOLD_CONTROL | ||
71 | +CPPFLAGS += -DFPIN_EVENT_HANDLER | ||
72 | |||
73 | # object files referencing MULTIPATH_DIR or CONFIG_DIR | ||
74 | # they need to be recompiled for unit tests | ||
75 | -- | ||
76 | 2.38.1 | ||
77 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch b/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch deleted file mode 100644 index 2d043c399..000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 820d2ef3596189041da43d1139da8689336bb918 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 26 Nov 2018 11:19:45 +0800 | ||
4 | Subject: [PATCH] Subject: [PATCH] Always use devmapper for kpartx | ||
5 | |||
6 | Do not try to compute the LIBDM_API_COOKIE make variable | ||
7 | from host information when cross-compiling. | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> | ||
12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
13 | |||
14 | Rebase to 0.7.1 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | |||
17 | Rebase to 0.7.7 | ||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | |||
20 | Rebase to 0.7.9 | ||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
22 | [OP: Rebase to 0.9.3] | ||
23 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
24 | --- | ||
25 | kpartx/Makefile | 4 +--- | ||
26 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
27 | |||
28 | diff --git a/kpartx/Makefile b/kpartx/Makefile | ||
29 | index 742d3bcd..d886483d 100644 | ||
30 | --- a/kpartx/Makefile | ||
31 | +++ b/kpartx/Makefile | ||
32 | @@ -9,9 +9,7 @@ LDFLAGS += $(BIN_LDFLAGS) | ||
33 | |||
34 | LIBDEPS += -ldevmapper | ||
35 | |||
36 | -ifneq ($(call check_func,dm_task_set_cookie,$(DEVMAPPER_INCDIR)/libdevmapper.h),0) | ||
37 | - CPPFLAGS += -DLIBDM_API_COOKIE | ||
38 | -endif | ||
39 | +CPPFLAGS += -DLIBDM_API_COOKIE | ||
40 | |||
41 | OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ | ||
42 | gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o | ||
43 | -- | ||
44 | 2.38.1 | ||
45 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch deleted file mode 100644 index ec123b212..000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 21a8680b7bd436867ac689a0b4b1b18a3359e208 Mon Sep 17 00:00:00 2001 | ||
2 | From: Geoff Parker <geoffrey.parker@arthrex.com> | ||
3 | Date: Fri, 9 Oct 2020 17:48:47 +0000 | ||
4 | Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to | ||
5 | work with pseudo | ||
6 | |||
7 | The multipath-tools libdmmp/Makefile install target uses 'perl -i' instead | ||
8 | of 'sed -i' for string substitutions. The perl method creates a temporary file | ||
9 | and overwrites the original which changes the inodes and corrupts the pseudo | ||
10 | db. Changes to pseduo cause a build abort rather than allow possible bad | ||
11 | ownership or permissions settings on the files. 'sed -i' is compatible | ||
12 | with pseudo. | ||
13 | |||
14 | Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com> | ||
15 | [OP: Rebase to 0.9.3] | ||
16 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
17 | --- | ||
18 | Upstream-Status: Pending | ||
19 | |||
20 | libdmmp/Makefile | 6 +++--- | ||
21 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
22 | |||
23 | diff --git a/libdmmp/Makefile b/libdmmp/Makefile | ||
24 | index e4589250..34e06425 100644 | ||
25 | --- a/libdmmp/Makefile | ||
26 | +++ b/libdmmp/Makefile | ||
27 | @@ -39,11 +39,11 @@ install: | ||
28 | $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB) | ||
29 | $(INSTALL_PROGRAM) -m 644 -D \ | ||
30 | $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE) | ||
31 | - perl -i -pe 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ | ||
32 | + sed -i 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ | ||
33 | $(DESTDIR)$(pkgconfdir)/$(PKGFILE) | ||
34 | - perl -i -pe 's|__LIBDIR__|$(usrlibdir)|g' \ | ||
35 | + sed -i 's|__LIBDIR__|$(usrlibdir)|g' \ | ||
36 | $(DESTDIR)$(pkgconfdir)/$(PKGFILE) | ||
37 | - perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ | ||
38 | + sed -i 's|__INCLUDEDIR__|$(includedir)|g' \ | ||
39 | $(DESTDIR)$(pkgconfdir)/$(PKGFILE) | ||
40 | $(INSTALL_PROGRAM) -d 755 $(DESTDIR)$(man3dir) | ||
41 | $(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3 | ||
42 | -- | ||
43 | 2.38.1 | ||
44 | |||
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb index a7a9019e3..df95df6f7 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb | |||
@@ -32,25 +32,23 @@ LICENSE = "GPL-2.0-only" | |||
32 | SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ | 32 | SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ |
33 | file://multipathd.oe \ | 33 | file://multipathd.oe \ |
34 | file://multipath.conf.example \ | 34 | file://multipath.conf.example \ |
35 | file://0021-RH-fixup-udev-rules-for-redhat.patch \ | 35 | file://0001-RH-fixup-udev-rules-for-redhat.patch \ |
36 | file://0022-RH-Remove-the-property-blacklist-exception-builtin.patch \ | 36 | file://0002-RH-Remove-the-property-blacklist-exception-builtin.patch \ |
37 | file://0023-RH-don-t-start-without-a-config-file.patch \ | 37 | file://0003-RH-don-t-start-without-a-config-file.patch \ |
38 | file://0024-RH-use-rpm-optflags-if-present.patch \ | 38 | file://0004-RH-use-rpm-optflags-if-present.patch \ |
39 | file://0025-RH-add-mpathconf.patch \ | 39 | file://0005-RH-add-mpathconf.patch \ |
40 | file://0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ | 40 | file://0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ |
41 | file://0027-RH-warn-on-invalid-regex-instead-of-failing.patch \ | 41 | file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \ |
42 | file://0028-RH-reset-default-find_mutipaths-value-to-off.patch \ | 42 | file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \ |
43 | file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ | 43 | file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \ |
44 | file://0030-Always-use-devmapper.patch \ | 44 | file://0010-Subject-PATCH-Always-use-devmapper.patch \ |
45 | file://0031-Always-use-devmapper-for-kpartx.patch \ | 45 | file://0011-fix-bug-of-do_compile-and-do_install.patch \ |
46 | file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \ | 46 | file://0012-add-explicit-dependency-on-libraries.patch \ |
47 | file://0001-fix-bug-of-do_compile-and-do_install.patch \ | ||
48 | file://0001-add-explicit-dependency-on-libraries.patch \ | ||
49 | " | 47 | " |
50 | 48 | ||
51 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 49 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
52 | 50 | ||
53 | SRCREV = "1332947447133fdf26246012b836868a3d974f0e" | 51 | SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199" |
54 | 52 | ||
55 | S = "${WORKDIR}/git" | 53 | S = "${WORKDIR}/git" |
56 | 54 | ||
@@ -103,6 +101,7 @@ do_install() { | |||
103 | ${D}${sysconfdir}/multipath.conf.example | 101 | ${D}${sysconfdir}/multipath.conf.example |
104 | } | 102 | } |
105 | 103 | ||
104 | FILES:${PN} += "${systemd_system_unitdir}" | ||
106 | FILES:${PN}-dbg += "${base_libdir}/multipath/.debug" | 105 | FILES:${PN}-dbg += "${base_libdir}/multipath/.debug" |
107 | 106 | ||
108 | PACKAGES =+ "${PN}-libs" | 107 | PACKAGES =+ "${PN}-libs" |