mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

multipath-tools: upgrade 0.10.0 -> 0.11.0

Browse Source 
0003-RH-don-t-start-without-a-config-file.patch
refreshed for 0.11.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2025-02-10 17:00:47 +08:00
committed by Khem Raj
parent 40ed18634d
commit 7b7083c812
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
+5 -8
View File
@@ -1,4 +1,4 @@
From 06a411b15e131eb4ebc2df95dc10fcff944bead6 Mon Sep 17 00:00:00 2001 From 2fe1037b8198bd00961d8df48e684296758127d1 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Fri, 23 Nov 2018 17:25:15 +0800 Date: Fri, 23 Nov 2018 17:25:15 +0800
Subject: [PATCH] RH: don't start without a config file Subject: [PATCH] RH: don't start without a config file
@@ -28,7 +28,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
5 files changed, 23 insertions(+) 5 files changed, 23 insertions(+)
diff --git a/libmultipath/config.c b/libmultipath/config.c diff --git a/libmultipath/config.c b/libmultipath/config.c
index 0e3a5cc1..3fbfcc85 100644 index 8b424d18..d8fafa1f 100644
--- a/libmultipath/config.c --- a/libmultipath/config.c
+++ b/libmultipath/config.c +++ b/libmultipath/config.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@@ -39,7 +39,7 @@ index 0e3a5cc1..3fbfcc85 100644
/* /*
* We don't support re-initialization after * We don't support re-initialization after
@@ -959,6 +960,23 @@ int init_config__ (const char *file, struct config *conf) @@ -937,6 +938,23 @@ int init_config__ (const char *file, struct config *conf)
} }
factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
validate_pctable(conf->overrides, 0, file); validate_pctable(conf->overrides, 0, file);
@@ -64,7 +64,7 @@ index 0e3a5cc1..3fbfcc85 100644
conf->processed_main_config = 1; conf->processed_main_config = 1;
diff --git a/libmultipath/config.h b/libmultipath/config.h diff --git a/libmultipath/config.h b/libmultipath/config.h
index 94cdf252..534b6142 100644 index 5b4ebf8c..2302eacc 100644
--- a/libmultipath/config.h --- a/libmultipath/config.h
+++ b/libmultipath/config.h +++ b/libmultipath/config.h
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@@ -101,7 +101,7 @@ index 7bc8806e..315884eb 100644
. .
.\" ---------------------------------------------------------------------------- .\" ----------------------------------------------------------------------------
diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
index 646001e6..979e6f12 100644 index b6a25b31..f78bb91b 100644
--- a/multipathd/multipathd.service.in --- a/multipathd/multipathd.service.in
+++ b/multipathd/multipathd.service.in +++ b/multipathd/multipathd.service.in
@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
@@ -112,6 +112,3 @@ index 646001e6..979e6f12 100644
Before=initrd-cleanup.service Before=initrd-cleanup.service
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
--
2.25.1
meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 30b85a61d665137ed1bca0d3e3d011c72758a192 Mon Sep 17 00:00:00 2001 From 4035b48b512b5010b1c33aeba8c58cf2705bca83 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 26 Nov 2018 09:55:12 +0800 Date: Mon, 26 Nov 2018 09:55:12 +0800
Subject: [PATCH] RH: add mpathconf Subject: [PATCH] RH: add mpathconf
@@ -29,10 +29,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
create mode 100644 multipath/mpathconf.8 create mode 100644 multipath/mpathconf.8
diff --git a/libmultipath/config.c b/libmultipath/config.c diff --git a/libmultipath/config.c b/libmultipath/config.c
index 3fbfcc85..fbaaca8c 100644 index d8fafa1f..cba7994b 100644
--- a/libmultipath/config.c --- a/libmultipath/config.c
+++ b/libmultipath/config.c +++ b/libmultipath/config.c
@@ -962,6 +962,7 @@ int init_config__ (const char *file, struct config *conf) @@ -940,6 +940,7 @@ int init_config__ (const char *file, struct config *conf)
validate_pctable(conf->overrides, 0, file); validate_pctable(conf->overrides, 0, file);
} else { } else {
condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
@@ -648,6 +648,3 @@ index 00000000..4cd32672
+.BR service (8), +.BR service (8),
+.SH AUTHOR +.SH AUTHOR
+Benjamin Marzinski <bmarzins@redhat.com> +Benjamin Marzinski <bmarzins@redhat.com>
--
2.25.1
meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb → meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.0.bb
+2 -2
View File
@@ -46,9 +46,9 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=ma
file://0012-add-explicit-dependency-on-libraries.patch \ file://0012-add-explicit-dependency-on-libraries.patch \
" "
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
SRCREV = "ee3a70175a8a9045e5c309d5392300922e2a0625" SRCREV = "de16cf82c5263fc148118be56ebf44c8f0ee60b8"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"