aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-08-31 23:22:11 -0700
committerRobert Yang <liezhi.yang@windriver.com>2014-09-18 19:56:14 -0700
commite8848953ff6815c2335dc23d18ee40277e04103f (patch)
tree15d27ae3e3fdd9fd3f6537d56a94b51af1aa6012
parentfd793500d0c3bbbd069d785d9b445c6e104b7461 (diff)
downloadmeta-openembedded-contrib-e8848953ff6815c2335dc23d18ee40277e04103f.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>
-rw-r--r--meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch37
-rw-r--r--meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb1
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 0000000000..f332658bcd
--- /dev/null
+++ b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch
@@ -0,0 +1,37 @@
+From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 18 Sep 2014 19:46:58 -0700
+Subject: [PATCH] arptables.sysv: remove bashism
+
+Use "." to replace of "source", and change /bin/bash to /bin/sh, the
+echo $"foo" works well in busybox.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ arptables.sysv | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arptables.sysv b/arptables.sysv
+index 7a90bd2..7710376 100644
+--- a/arptables.sysv
++++ b/arptables.sysv
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # init script for arptables
+ #
+@@ -11,7 +11,7 @@
+ #
+ # config: __SYSCONFIG__/arptables
+
+-source /etc/init.d/functions
++. /etc/init.d/functions
+ # source /etc/sysconfig/network
+
+ # Check that networking is up.
+--
+1.7.9.5
+
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 74f81b554a..41a55c0276 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 = " \
file://arptables-compile-install.patch \
file://arptables-init-busybox.patch \
file://arptables-arpt-get-target-fix.patch \
+ file://arptables-remove-bashism.patch \
"
SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928"