On Fri, Jun 22, 2018 at 02:18:46PM +0200, Oliver Graute wrote: > Signed-off-by: Oliver Graute <oliver.gra...@neuhaus.de> > --- > .../ebtables-v2.0.10-4/0001-fixed-returncode.patch | 23 ++++++ > .../0002-cross-complile-prep.patch | 23 ++++++ > .../ebtables-v2.0.10-4/0003-changed-bin-dir.patch | 21 ++++++ > patches/ebtables-v2.0.10-4/series | 6 ++ > rules/ebtables.in | 12 ++++ > rules/ebtables.make | 83 > ++++++++++++++++++++++ > 6 files changed, 168 insertions(+) > create mode 100644 patches/ebtables-v2.0.10-4/0001-fixed-returncode.patch > create mode 100644 patches/ebtables-v2.0.10-4/0002-cross-complile-prep.patch > create mode 100644 patches/ebtables-v2.0.10-4/0003-changed-bin-dir.patch > create mode 100644 patches/ebtables-v2.0.10-4/series > create mode 100644 rules/ebtables.in > create mode 100644 rules/ebtables.make > > diff --git a/patches/ebtables-v2.0.10-4/0001-fixed-returncode.patch > b/patches/ebtables-v2.0.10-4/0001-fixed-returncode.patch > new file mode 100644 > index 0000000..77cc296 > --- /dev/null > +++ b/patches/ebtables-v2.0.10-4/0001-fixed-returncode.patch > @@ -0,0 +1,23 @@ > +From: Oliver Graute <oliver.gra...@neuhaus.de> > +Date: Fri, 27 Nov 2015 11:13:46 +0100 > +Subject: [PATCH] fixed returncode > + > +fixed returncode in store_counters_in_file > + > +--- > + communication.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/communication.c b/communication.c > +index 62ed667..ba058c0 100644 > +--- a/communication.c > ++++ b/communication.c > +@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct > ebt_u_replace *repl) > + } > + close_file: > + fclose(file); > +- return 0; > ++ return ret; > + } > + > + /* Gets executed after ebt_deliver_table. Delivers the counters to the > kernel > diff --git a/patches/ebtables-v2.0.10-4/0002-cross-complile-prep.patch > b/patches/ebtables-v2.0.10-4/0002-cross-complile-prep.patch > new file mode 100644 > index 0000000..c194969 > --- /dev/null > +++ b/patches/ebtables-v2.0.10-4/0002-cross-complile-prep.patch > @@ -0,0 +1,23 @@ > +From: Oliver Graute <oliver.gra...@neuhaus.de> > +Date: Fri, 27 Nov 2015 11:46:39 +0100 > +Subject: [PATCH] cross complile prep > + > +Cross compile patch for arm > + > +--- > + Makefile | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index c1106a4..6b88ff6 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -19,7 +19,7 @@ DESTDIR:= > + > + CFLAGS:=-Wall -Wunused -Werror > + CFLAGS_SH_LIB:=-fPIC -O3 > +-CC:=gcc > ++CC:=arm-v5te-linux-gnueabi-gcc
This looks wrong. Maybe $(CROSS_CC_ENV) in the EBTABLES_MAKE_OPT could work. > + > + ifeq ($(shell uname -m),sparc64) > + CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 > diff --git a/patches/ebtables-v2.0.10-4/0003-changed-bin-dir.patch > b/patches/ebtables-v2.0.10-4/0003-changed-bin-dir.patch > new file mode 100644 > index 0000000..1173e59 > --- /dev/null > +++ b/patches/ebtables-v2.0.10-4/0003-changed-bin-dir.patch > @@ -0,0 +1,21 @@ > +From: Oliver Graute <oliver.gra...@neuhaus.de> > +Date: Fri, 27 Nov 2015 12:01:59 +0100 > +Subject: [PATCH] changed bin dir > + > +--- > + Makefile | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 6b88ff6..8d735ac 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -11,7 +11,7 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed > 's/\(.*\)\/.*/\1/')/ > + # default paths > + LIBDIR:=/usr/lib > + MANDIR:=/usr/local/man > +-BINDIR:=/usr/local/sbin > ++BINDIR:=/sbin /usr/sbin and try to set this in EBTABLES_MAKE_OPT > + ETCDIR:=/etc > + INITDIR:=/etc/rc.d/init.d > + SYSCONFIGDIR:=/etc/sysconfig > diff --git a/patches/ebtables-v2.0.10-4/series > b/patches/ebtables-v2.0.10-4/series > new file mode 100644 > index 0000000..23c1b43 > --- /dev/null > +++ b/patches/ebtables-v2.0.10-4/series > @@ -0,0 +1,6 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-fixed-returncode.patch > +0002-cross-complile-prep.patch > +0003-changed-bin-dir.patch > +# 5247698c8b551a01103d9b67868658de - git-ptx-patches magic > diff --git a/rules/ebtables.in b/rules/ebtables.in > new file mode 100644 > index 0000000..460aed8 > --- /dev/null > +++ b/rules/ebtables.in > @@ -0,0 +1,12 @@ > +## SECTION=networking > + > +config EBTABLES > + tristate > + prompt "ebtables" > + help > + The ebtables program is a filtering tool for a Linux-based bridging > + firewall. It enables transparent filtering of network traffic passing > + through a Linux bridge. The filtering possibilities are limited to > + link layer filtering and some basic filtering on higher network > + layers. Advanced logging, MAC DNAT/SNAT and brouter facilities > + are also included. > diff --git a/rules/ebtables.make b/rules/ebtables.make > new file mode 100644 > index 0000000..155de47 > --- /dev/null > +++ b/rules/ebtables.make > @@ -0,0 +1,83 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, > Oliver Graute <oliver.gra...@neuhaus.de> > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_EBTABLES) += ebtables > + > +# > +# Paths and names > +# > +EBTABLES_VERSION := v2.0.10-4 > +EBTABLES_MD5 := 506742a3d44b9925955425a659c1a8d0 > +EBTABLES := ebtables-$(EBTABLES_VERSION) > +EBTABLES_SUFFIX := tar.gz > +EBTABLES_URL := > ftp://ftp.netfilter.org/pub/ebtables/$(EBTABLES).$(EBTABLES_SUFFIX) > +EBTABLES_SOURCE := $(SRCDIR)/$(EBTABLES).$(EBTABLES_SUFFIX) > +EBTABLES_DIR := $(BUILDDIR)/$(EBTABLES) > +EBTABLES_LICENSE := GPLv2 use the SPDX identifier. > + > +# EBTABLES_CONF_TOOL := autoconf > +EBTABLES_CONF_OPT := $(CROSS_AUTOCONF_USR) see my other comments. > + > +EBTABLES_MAKE_ENV := \ > + $(CROSS_ENV) remove. > + > +EBTABLES_WRAPPER_BLACKLIST := \ > + TARGET_LINKER_AS_NEEDED why? > + > +EBATBLES_MAKE_OPT := \ > + BINDIR = /sbin /usr/sbin and spelling error. Maybe that's why you added the patch? > +# > ---------------------------------------------------------------------------- > +# Target-Install > +# > ---------------------------------------------------------------------------- > + > +$(STATEDIR)/ebtables.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, ebtables) > + @$(call install_fixup, ebtables,PRIORITY,optional) > + @$(call install_fixup, ebtables,SECTION,base) > + @$(call install_fixup, ebtables,AUTHOR,"<oliver.gra...@neuhaus.de>") > + @$(call install_fixup, ebtables,DESCRIPTION,missing) > + > + @$(call install_copy, ebtables, 0, 0, 0755, -, /sbin/ebtables) > + @$(call install_copy, ebtables, 0, 0, 0755, -, /sbin/ebtables-restore) /usr/sbin for both. Michael > + @$(call install_alternative, ebtables, 0, 0, 0644, /etc/ebtables-config) > + @$(call install_alternative, ebtables, 0, 0, 0644, /etc/ethertypes) > + @$(call install_lib, ebtables, 0, 0, 0644, libebtc) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_802_3) > + @$(call install_lib, ebtables, 0, 0, 0644, libebtable_broute) > + @$(call install_lib, ebtables, 0, 0, 0644, libebtable_filter) > + @$(call install_lib, ebtables, 0, 0, 0644, libebtable_nat) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_among) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_arpreply) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_arp) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_ip6) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_ip) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_limit) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_log) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_mark_m) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_mark) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_nat) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_nflog) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_pkttype) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_redirect) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_standard) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_stp) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_ulog) > + @$(call install_lib, ebtables, 0, 0, 0644, libebt_vlan) > + > + @$(call install_finish, ebtables) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 1.9.1 > > > -- > i. A. Oliver GRAUTE > Software Entwicklung Dipl.-Inform. (Uni) > > Sagemcom Dr. Neuhaus GmbH > Papenreye 65, 22453 Hamburg GERMANY > Phone: +49 (0) 40 55304-3045 > Fax: +49 (0) 40 55304-180 > oliver.gra...@sagemcom.com > > www.neuhaus.de / www.sagemcom.com > Geschäftsführer: André Karnatz, Patrick Sevian > Sitz der Gesellschaft: Hamburg > Amtsgericht Hamburg / HRB 133678 > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
