Rewrite ebtables-legacy-save to avoid using bashisms.
Signed-off-by: Peter Kjellerstedt <[email protected]>
---
.../ebtables-2.0.11/ebtables-legacy-save | 19 +++++++++----------
.../ebtables/ebtables_2.0.11.bb | 2 --
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
index 2133600f77..0b39c23deb 100644
---
a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
+++
b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
EBTABLES="/usr/sbin/ebtables-legacy"
@@ -11,7 +11,7 @@ cnt=""
for table_name in $(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed
s/ebtable_//); do
table=$($EBTABLES -t $table_name -L $cnt)
- [ $? -eq 0 ] || { echo "$table"; exit -1; }
+ [ $? -eq 0 ] || { echo "$table"; exit 1; }
chain=""
rules=""
@@ -20,24 +20,23 @@ for table_name in $(grep -E '^ebtable_' /proc/modules | cut
-f1 -d' ' | sed s/eb
case "$line" in
Bridge\ table:\ *)
- echo "*${line:14}"
+ echo "*${line#Bridge table: }"
;;
Bridge\ chain:\ *)
- chain="${line:14}"
+ chain="${line#Bridge chain: }"
chain="${chain%%,*}"
policy="${line##*policy: }"
echo ":$chain $policy"
;;
*)
- if [ "$cnt" = "--Lc" ]; then
- line=${line/, pcnt \=/ -c}
- line=${line/-- bcnt \=/}
- fi
- rules="$rules-A $chain $line\n"
+ [ "$cnt" != "--Lc" ] ||
+ line=$(echo "$line" | sed -e 's/, pcnt =/-c/' -e 's/ --
bcnt =//')
+ rules="$rules-A $chain $line
+"
;;
esac
done <<EOF
$table
EOF
- echo -e $rules
+ echo "$rules"
done
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
index 8918936e14..be8c49854e 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
@@ -6,8 +6,6 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e"
SECTION = "net"
-RDEPENDS:${PN} += "bash"
-
RRECOMMENDS:${PN} += "kernel-module-ebtables \
"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#115412):
https://lists.openembedded.org/g/openembedded-devel/message/115412
Mute This Topic: https://lists.openembedded.org/mt/111113601/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
