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

lvm2: remove subitted patch

Browse Source 
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>
This commit is contained in:
Markus Volk
2024-05-28 10:18:07 +02:00
committed by Khem Raj
parent 1e5179077a
commit cc4e9fbd82
14 changed files with 67 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
+7 -10
View File
@@ -1,7 +1,7 @@
From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001
From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Mon, 26 Nov 2018 14:53:09 +0800
Subject: [PATCH 1/3] Avoid bashisms in init scripts
Subject: [PATCH] Avoid bashisms in init scripts
Upstream-Status: Inappropriate
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
index 347c395..b2e9cf9 100644
index 347c39574..b2e9cf932 100644
--- a/scripts/blk_availability_init_red_hat.in
+++ b/scripts/blk_availability_init_red_hat.in
@@ -1,4 +1,4 @@
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
;;
esac
diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
index c82f8f5..a3a321d 100755
index c82f8f547..a3a321d9c 100755
--- a/scripts/cmirrord_init_red_hat.in
+++ b/scripts/cmirrord_init_red_hat.in
@@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
esac
diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
index 176ff5d..825f6ad 100644
index 176ff5dcb..825f6ad84 100644
--- a/scripts/lvm2_lvmpolld_init_red_hat.in
+++ b/scripts/lvm2_lvmpolld_init_red_hat.in
@@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
esac
diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
index 95e4125..dff89cd 100644
index 95e4125a0..dff89cd38 100644
--- a/scripts/lvm2_monitoring_init_red_hat.in
+++ b/scripts/lvm2_monitoring_init_red_hat.in
@@ -1,4 +1,4 @@
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
esac
diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
index 8eb06c5..2e8d0f7 100644
index 8eb06c509..2e8d0f71e 100644
--- a/scripts/lvm2_monitoring_init_rhel4
+++ b/scripts/lvm2_monitoring_init_rhel4
@@ -1,4 +1,4 @@
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
;;
esac
--
2.7.4