diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-27 16:32:44 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-27 11:13:37 -0800 |
commit | a7bc7b6853acbb0b85be2d60fb1046bc481edf5c (patch) | |
tree | 35ffa468565fa5a3d8c13e8735eabc14a64a63e6 /meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | |
parent | 59ea4a873dfbab38b53a74d429f8dd1c6da2cc1f (diff) | |
download | meta-openembedded-a7bc7b6853acbb0b85be2d60fb1046bc481edf5c.tar.gz |
lvm2/libdevmapper: 2.02.180 -> 2.03.01
- 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>
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.patch | 136 |
1 files changed, 37 insertions, 99 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 5b55111dc..3c4a3a151 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,26 +1,27 @@ | |||
1 | From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001 | 1 | From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <pkj@axis.com> | 2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
3 | Date: Fri, 17 Mar 2017 03:18:28 +0100 | 3 | Date: Mon, 26 Nov 2018 14:53:09 +0800 |
4 | Subject: [PATCH] Avoid bashisms in init scripts | 4 | Subject: [PATCH 1/3] Avoid bashisms in init scripts |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
9 | |||
10 | Rebase to 2.03.01 | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
9 | --- | 13 | --- |
10 | scripts/blk_availability_init_red_hat.in | 4 ++-- | 14 | scripts/blk_availability_init_red_hat.in | 4 ++-- |
11 | scripts/clvmd_init_red_hat.in | 6 +++--- | 15 | scripts/cmirrord_init_red_hat.in | 4 ++-- |
12 | scripts/cmirrord_init_red_hat.in | 4 ++-- | 16 | scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- |
13 | scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++-- | 17 | scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- |
14 | scripts/lvm2_lvmetad_init_red_hat.in | 4 ++-- | 18 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- |
15 | scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- | 19 | 5 files changed, 10 insertions(+), 10 deletions(-) |
16 | scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- | ||
17 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- | ||
18 | 8 files changed, 17 insertions(+), 17 deletions(-) | ||
19 | 20 | ||
20 | Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in | 21 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in |
21 | =================================================================== | 22 | index 347c395..b2e9cf9 100644 |
22 | --- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in | 23 | --- a/scripts/blk_availability_init_red_hat.in |
23 | +++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in | 24 | +++ b/scripts/blk_availability_init_red_hat.in |
24 | @@ -1,4 +1,4 @@ | 25 | @@ -1,4 +1,4 @@ |
25 | -#!/bin/bash | 26 | -#!/bin/bash |
26 | +#!/bin/sh | 27 | +#!/bin/sh |
@@ -35,38 +36,10 @@ Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in | |||
35 | + echo "Usage: $0 {start|stop|status}" | 36 | + echo "Usage: $0 {start|stop|status}" |
36 | ;; | 37 | ;; |
37 | esac | 38 | esac |
38 | Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in | 39 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in |
39 | =================================================================== | 40 | index c82f8f5..a3a321d 100755 |
40 | --- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in | 41 | --- a/scripts/cmirrord_init_red_hat.in |
41 | +++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in | 42 | +++ b/scripts/cmirrord_init_red_hat.in |
42 | @@ -1,4 +1,4 @@ | ||
43 | -#!/bin/bash | ||
44 | +#!/bin/sh | ||
45 | # | ||
46 | # clvmd - Clustered LVM Daemon init script | ||
47 | # | ||
48 | @@ -161,7 +161,7 @@ restart() { | ||
49 | fi | ||
50 | } | ||
51 | |||
52 | -[ "$EUID" != "0" ] && { | ||
53 | +[ "$(id -u)" != "0" ] && { | ||
54 | echo "clvmd init script can only be executed as root user" | ||
55 | exit 4 | ||
56 | } | ||
57 | @@ -206,7 +206,7 @@ case "$1" in | ||
58 | ;; | ||
59 | |||
60 | *) | ||
61 | - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" | ||
62 | + echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" | ||
63 | rtrn=2 | ||
64 | ;; | ||
65 | esac | ||
66 | Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in | ||
67 | =================================================================== | ||
68 | --- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in | ||
69 | +++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in | ||
70 | @@ -1,4 +1,4 @@ | 43 | @@ -1,4 +1,4 @@ |
71 | -#!/bin/bash | 44 | -#!/bin/bash |
72 | +#!/bin/sh | 45 | +#!/bin/sh |
@@ -82,48 +55,10 @@ Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in | |||
82 | ;; | 55 | ;; |
83 | esac | 56 | esac |
84 | 57 | ||
85 | Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in | 58 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in |
86 | =================================================================== | 59 | index 176ff5d..825f6ad 100644 |
87 | --- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in | 60 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in |
88 | +++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in | 61 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in |
89 | @@ -1,4 +1,4 @@ | ||
90 | -#!/bin/bash | ||
91 | +#!/bin/sh | ||
92 | |||
93 | sbindir="@SBINDIR@" | ||
94 | |||
95 | @@ -54,7 +54,7 @@ case "$1" in | ||
96 | rtrn=$? | ||
97 | ;; | ||
98 | *) | ||
99 | - echo $"Usage: $0 {activate|deactivate}" | ||
100 | + echo "Usage: $0 {activate|deactivate}" | ||
101 | rtrn=3 | ||
102 | ;; | ||
103 | esac | ||
104 | Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in | ||
105 | =================================================================== | ||
106 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in | ||
107 | +++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in | ||
108 | @@ -1,4 +1,4 @@ | ||
109 | -#!/bin/bash | ||
110 | +#!/bin/sh | ||
111 | # | ||
112 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. | ||
113 | # | ||
114 | @@ -103,7 +103,7 @@ case "$1" in | ||
115 | ;; | ||
116 | |||
117 | *) | ||
118 | - echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" | ||
119 | + echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" | ||
120 | ;; | ||
121 | esac | ||
122 | |||
123 | Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in | ||
124 | =================================================================== | ||
125 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in | ||
126 | +++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in | ||
127 | @@ -1,4 +1,4 @@ | 62 | @@ -1,4 +1,4 @@ |
128 | -#!/bin/bash | 63 | -#!/bin/bash |
129 | +#!/bin/sh | 64 | +#!/bin/sh |
@@ -139,10 +74,10 @@ Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in | |||
139 | ;; | 74 | ;; |
140 | esac | 75 | esac |
141 | 76 | ||
142 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in | 77 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in |
143 | =================================================================== | 78 | index 95e4125..dff89cd 100644 |
144 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in | 79 | --- a/scripts/lvm2_monitoring_init_red_hat.in |
145 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in | 80 | +++ b/scripts/lvm2_monitoring_init_red_hat.in |
146 | @@ -1,4 +1,4 @@ | 81 | @@ -1,4 +1,4 @@ |
147 | -#!/bin/bash | 82 | -#!/bin/bash |
148 | +#!/bin/sh | 83 | +#!/bin/sh |
@@ -158,10 +93,10 @@ Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in | |||
158 | ;; | 93 | ;; |
159 | esac | 94 | esac |
160 | 95 | ||
161 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 | 96 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 |
162 | =================================================================== | 97 | index 8eb06c5..2e8d0f7 100644 |
163 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4 | 98 | --- a/scripts/lvm2_monitoring_init_rhel4 |
164 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 | 99 | +++ b/scripts/lvm2_monitoring_init_rhel4 |
165 | @@ -1,4 +1,4 @@ | 100 | @@ -1,4 +1,4 @@ |
166 | -#!/bin/bash | 101 | -#!/bin/bash |
167 | +#!/bin/sh | 102 | +#!/bin/sh |
@@ -177,3 +112,6 @@ Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 | |||
177 | ;; | 112 | ;; |
178 | esac | 113 | esac |
179 | 114 | ||
115 | -- | ||
116 | 2.7.4 | ||
117 | |||