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

lvm2/libdevmapper: 2.02.180 -> 2.03.01

Browse Source 
- Upddate upstream SRC_URI, use github to replace tarball

- Rebase 0001-Avoid-bashisms-in-init-scripts.patch,
         0005-do-not-build-manual.patch,
         0001-explicitly-do-not-install-libdm.patch

- Remove `--enable-applib' since upstream [0d22b58 liblvm: remove lvmapi]

- Remove `lvmetad' since upstream [117160b Remove lvmetad]

- Remove  `oe_runmake ... -C tools install_device-mapper' since upstream
  [0524829 dmsetup: move to libdm/dm-tools/dmsetup]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-11-27 16:32:44 +08:00
committed by Khem Raj
parent 59ea4a873d
commit a7bc7b6853
6 changed files with 76 additions and 141 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
+38 -100
View File
@@ -1,26 +1,27 @@
From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Fri, 17 Mar 2017 03:18:28 +0100
Subject: [PATCH] Avoid bashisms in init scripts
From ea66faf68c93735edb1f2691cd7364b8cab83fef 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
Upstream-Status: Inappropriate
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
scripts/blk_availability_init_red_hat.in | 4 ++--
scripts/clvmd_init_red_hat.in | 6 +++---
scripts/cmirrord_init_red_hat.in | 4 ++--
scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++--
scripts/lvm2_lvmetad_init_red_hat.in | 4 ++--
scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_rhel4 | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in
===================================================================
--- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in
+++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in
Rebase to 2.03.01
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
scripts/blk_availability_init_red_hat.in | 4 ++--
scripts/cmirrord_init_red_hat.in | 4 ++--
scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_rhel4 | 4 ++--
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
--- a/scripts/blk_availability_init_red_hat.in
+++ b/scripts/blk_availability_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -35,38 +36,10 @@ Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in
+ echo "Usage: $0 {start|stop|status}"
;;
esac
Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in
===================================================================
--- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in
+++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# clvmd - Clustered LVM Daemon init script
#
@@ -161,7 +161,7 @@ restart() {
fi
}
-[ "$EUID" != "0" ] && {
+[ "$(id -u)" != "0" ] && {
echo "clvmd init script can only be executed as root user"
exit 4
}
@@ -206,7 +206,7 @@ case "$1" in
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
rtrn=2
;;
esac
Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in
===================================================================
--- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in
+++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in
diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
index c82f8f5..a3a321d 100755
--- a/scripts/cmirrord_init_red_hat.in
+++ b/scripts/cmirrord_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -82,48 +55,10 @@ Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in
;;
esac
Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in
===================================================================
--- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in
+++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
sbindir="@SBINDIR@"
@@ -54,7 +54,7 @@ case "$1" in
rtrn=$?
;;
*)
- echo $"Usage: $0 {activate|deactivate}"
+ echo "Usage: $0 {activate|deactivate}"
rtrn=3
;;
esac
Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in
===================================================================
--- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in
+++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved.
#
@@ -103,7 +103,7 @@ case "$1" in
;;
*)
- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
+ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
;;
esac
Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in
===================================================================
--- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in
+++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in
diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
index 176ff5d..825f6ad 100644
--- a/scripts/lvm2_lvmpolld_init_red_hat.in
+++ b/scripts/lvm2_lvmpolld_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -139,10 +74,10 @@ Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in
;;
esac
Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in
===================================================================
--- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in
+++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in
diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
index 95e4125..dff89cd 100644
--- a/scripts/lvm2_monitoring_init_red_hat.in
+++ b/scripts/lvm2_monitoring_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -158,10 +93,10 @@ Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in
;;
esac
Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4
===================================================================
--- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4
+++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4
diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
index 8eb06c5..2e8d0f7 100644
--- a/scripts/lvm2_monitoring_init_rhel4
+++ b/scripts/lvm2_monitoring_init_rhel4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -177,3 +112,6 @@ Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4
;;
esac
--
2.7.4