b3a6c7d3a3
With the version bump to 2.0.11, ebtables switch to autotools build
system. In addition, ebtables-{restore/save} moved to being installed
as ebtables-legacy-{restore/save}.
Changes to support this version bump include:
* Remove dependency on !BR2_STATIC_LIBS for ebtables-restore as the
switch to autotools supports compiling with static libraries.
* Update ebtables-save script patch to use /usr/sbin/ebtables-legacy
* Remove 0001-*-ethernetdb*.patch as it was merged with commit:
http://git.netfilter.org/ebtables/commit/?id=f8079671326e9fd079391d24911a9a8a77f1d6fd
* Remove 0002-*-musl-*.patch as support was added with commit:
http://git.netfilter.org/ebtables/commit/?id=9fff3d5f9da00255463d28b38d688c25025b7fb1
Tested with test-pkg with BR2_PACKAGE_EBTABLES=y:
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: OK
sourcery-arm [6/6]: OK
Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com>
Tested-by: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
80 lines
2.1 KiB
Diff
80 lines
2.1 KiB
Diff
From 73536d15c80be96049289d96fc32122467c56b1d Mon Sep 17 00:00:00 2001
|
|
From: Matt Weber <matthew.weber@rockwellcollins.com>
|
|
Date: Mon, 16 Dec 2019 13:27:30 -0600
|
|
Subject: [PATCH] ebtables: replace ebtables-save perl script with bash rewrite
|
|
|
|
Fedora provides a bash replacement for the default ebtables-save perl
|
|
script. Using it allows the ebtables run-time dependency on perl to
|
|
be replaced with a runtime dependency on bash - which is lower
|
|
overhead and more likely to be present on typical embedded systems
|
|
already.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=746040
|
|
http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save
|
|
|
|
Upstream:
|
|
https://github.com/openembedded/meta-openembedded/commit/7f723007364ba79de05447671e83d4eefb3097dc
|
|
|
|
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
|
|
[ryanbarnett3@gmail.com:
|
|
- changed EBTABLES executable to /usr/sbin/ebtables-legacy
|
|
]
|
|
Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com>
|
|
---
|
|
ebtables-save.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 43 insertions(+)
|
|
create mode 100644 ebtables-save.sh
|
|
|
|
diff --git a/ebtables-save.sh b/ebtables-save.sh
|
|
new file mode 100644
|
|
index 0000000..2d7fc4e
|
|
--- /dev/null
|
|
+++ b/ebtables-save.sh
|
|
@@ -0,0 +1,43 @@
|
|
+#!/bin/bash
|
|
+
|
|
+EBTABLES="/usr/sbin/ebtables-legacy"
|
|
+
|
|
+[ -x "$EBTABLES" ] || exit 1
|
|
+
|
|
+echo "# Generated by ebtables-save v1.0 on $(date)"
|
|
+
|
|
+cnt=""
|
|
+[ "x$EBTABLES_SAVE_COUNTER" = "xyes" ] && cnt="--Lc"
|
|
+
|
|
+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; }
|
|
+
|
|
+ chain=""
|
|
+ rules=""
|
|
+ while read line; do
|
|
+ [ -z "$line" ] && continue
|
|
+
|
|
+ case "$line" in
|
|
+ Bridge\ table:\ *)
|
|
+ echo "*${line:14}"
|
|
+ ;;
|
|
+ Bridge\ chain:\ *)
|
|
+ chain="${line:14}"
|
|
+ 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"
|
|
+ ;;
|
|
+ esac
|
|
+ done <<EOF
|
|
+$table
|
|
+EOF
|
|
+ echo -e $rules
|
|
+done
|
|
--
|
|
2.17.1
|
|
|