summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-05-28 10:18:07 +0200
committerKhem Raj <raj.khem@gmail.com>2024-05-28 09:34:36 -0700
commitcc4e9fbd823a9af1f6b8f622ce86d62172ee9ade (patch)
tree08b625762e6bd29d1ade5bc8cea18d35bdc2716c /meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
parent1e5179077af806953bcb13984ab0a80e93e9d75f (diff)
downloadmeta-openembedded-cc4e9fbd823a9af1f6b8f622ce86d62172ee9ade.tar.gz
lvm2: remove subitted patch
devmapper update also updated lvm2. Thus build fails with: patching file daemons/lvmdbusd/utils.py Hunk #1 FAILED at 778. 1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py - Drop the submitted patch - Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper and lvm2 - refresh patches Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch')
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
index 3c4a3a151d..fb58793a17 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
@@ -1,7 +1,7 @@
1From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 1From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 2From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
3Date: Mon, 26 Nov 2018 14:53:09 +0800 3Date: Mon, 26 Nov 2018 14:53:09 +0800
4Subject: [PATCH 1/3] Avoid bashisms in init scripts 4Subject: [PATCH] Avoid bashisms in init scripts
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 5 files changed, 10 insertions(+), 10 deletions(-) 19 5 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in 21diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
22index 347c395..b2e9cf9 100644 22index 347c39574..b2e9cf932 100644
23--- a/scripts/blk_availability_init_red_hat.in 23--- a/scripts/blk_availability_init_red_hat.in
24+++ b/scripts/blk_availability_init_red_hat.in 24+++ b/scripts/blk_availability_init_red_hat.in
25@@ -1,4 +1,4 @@ 25@@ -1,4 +1,4 @@
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
37 ;; 37 ;;
38 esac 38 esac
39diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in 39diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
40index c82f8f5..a3a321d 100755 40index c82f8f547..a3a321d9c 100755
41--- a/scripts/cmirrord_init_red_hat.in 41--- a/scripts/cmirrord_init_red_hat.in
42+++ b/scripts/cmirrord_init_red_hat.in 42+++ b/scripts/cmirrord_init_red_hat.in
43@@ -1,4 +1,4 @@ 43@@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
56 esac 56 esac
57 57
58diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in 58diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
59index 176ff5d..825f6ad 100644 59index 176ff5dcb..825f6ad84 100644
60--- a/scripts/lvm2_lvmpolld_init_red_hat.in 60--- a/scripts/lvm2_lvmpolld_init_red_hat.in
61+++ b/scripts/lvm2_lvmpolld_init_red_hat.in 61+++ b/scripts/lvm2_lvmpolld_init_red_hat.in
62@@ -1,4 +1,4 @@ 62@@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
75 esac 75 esac
76 76
77diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in 77diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
78index 95e4125..dff89cd 100644 78index 95e4125a0..dff89cd38 100644
79--- a/scripts/lvm2_monitoring_init_red_hat.in 79--- a/scripts/lvm2_monitoring_init_red_hat.in
80+++ b/scripts/lvm2_monitoring_init_red_hat.in 80+++ b/scripts/lvm2_monitoring_init_red_hat.in
81@@ -1,4 +1,4 @@ 81@@ -1,4 +1,4 @@
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
94 esac 94 esac
95 95
96diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 96diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
97index 8eb06c5..2e8d0f7 100644 97index 8eb06c509..2e8d0f71e 100644
98--- a/scripts/lvm2_monitoring_init_rhel4 98--- a/scripts/lvm2_monitoring_init_rhel4
99+++ b/scripts/lvm2_monitoring_init_rhel4 99+++ b/scripts/lvm2_monitoring_init_rhel4
100@@ -1,4 +1,4 @@ 100@@ -1,4 +1,4 @@
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
112 ;; 112 ;;
113 esac 113 esac
114 114
115--
1162.7.4
117