diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-31 23:22:11 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-26 05:41:50 +0200 |
commit | d041cc7bcc0ea71ab1c7f4e0d02286a5b776b84c (patch) | |
tree | aeeb17b2899e3263634d6d1a7e52060427b7352a /meta-networking | |
parent | 5b17d7cf94077b8ab40bf5aa00282087fa5c179b (diff) | |
download | meta-openembedded-d041cc7bcc0ea71ab1c7f4e0d02286a5b776b84c.tar.gz |
arptables: remove bashism
Bashism:
possible bashism in arptables/etc/init.d/arptables line 14 (should be '.', not 'source'):
source /etc/init.d/functions
possible bashism in arptables/etc/init.d/arptables line 96 ($"foo" should be eval_gettext "foo"):
echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
Use "." to replace of "source", and change /bin/bash to /bin/sh, the
echo $"foo" works well in our busybox.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch | 37 | ||||
-rw-r--r-- | meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch new file mode 100644 index 000000000..f332658bc --- /dev/null +++ b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 18 Sep 2014 19:46:58 -0700 | ||
4 | Subject: [PATCH] arptables.sysv: remove bashism | ||
5 | |||
6 | Use "." to replace of "source", and change /bin/bash to /bin/sh, the | ||
7 | echo $"foo" works well in busybox. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
12 | --- | ||
13 | arptables.sysv | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/arptables.sysv b/arptables.sysv | ||
17 | index 7a90bd2..7710376 100644 | ||
18 | --- a/arptables.sysv | ||
19 | +++ b/arptables.sysv | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/bin/bash | ||
22 | +#!/bin/sh | ||
23 | # | ||
24 | # init script for arptables | ||
25 | # | ||
26 | @@ -11,7 +11,7 @@ | ||
27 | # | ||
28 | # config: __SYSCONFIG__/arptables | ||
29 | |||
30 | -source /etc/init.d/functions | ||
31 | +. /etc/init.d/functions | ||
32 | # source /etc/sysconfig/network | ||
33 | |||
34 | # Check that networking is up. | ||
35 | -- | ||
36 | 1.7.9.5 | ||
37 | |||
diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb index 74f81b554..41a55c027 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = " \ | |||
13 | file://arptables-compile-install.patch \ | 13 | file://arptables-compile-install.patch \ |
14 | file://arptables-init-busybox.patch \ | 14 | file://arptables-init-busybox.patch \ |
15 | file://arptables-arpt-get-target-fix.patch \ | 15 | file://arptables-arpt-get-target-fix.patch \ |
16 | file://arptables-remove-bashism.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" | 18 | SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" |
18 | SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" | 19 | SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" |