* [ptxdist] [PATCHv3] ebtables: this patch adds ebtables to ptxdist
@ 2018-06-25 9:37 Oliver Graute
2018-06-25 14:27 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Oliver Graute @ 2018-06-25 9:37 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
.../ebtables-v2.0.10-4/0001-fixed-returncode.patch | 23 ++++++
patches/ebtables-v2.0.10-4/series | 4 ++
rules/ebtables.in | 12 ++++
rules/ebtables.make | 82 ++++++++++++++++++++++
4 files changed, 121 insertions(+)
create mode 100644 patches/ebtables-v2.0.10-4/0001-fixed-returncode.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.graute@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/series b/patches/ebtables-v2.0.10-4/series
new file mode 100644
index 0000000..05283fe
--- /dev/null
+++ b/patches/ebtables-v2.0.10-4/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fixed-returncode.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..906e40e
--- /dev/null
+++ b/rules/ebtables.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@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 := GPL-2.0
+
+EBTABLES_CONF_OPT := $(CROSS_AUTOCONF_USR)
+
+EBTABLES_MAKE_ENV := \
+ $(CROSS_ENV)
+
+EBTABLES_MAKE_OPT := \
+ $(CROSS_CC_ENV)\
+ BINDIR=/usr/sbin
+
+# ----------------------------------------------------------------------------
+# 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.graute@neuhaus.de>")
+ @$(call install_fixup, ebtables,DESCRIPTION,missing)
+
+ @$(call install_copy, ebtables, 0, 0, 0755, -, /usr/sbin/ebtables)
+ @$(call install_copy, ebtables, 0, 0, 0755, -, /usr/sbin/ebtables-restore)
+ @$(call install_copy, ebtables, 0, 0, 0755, -, /usr/sbin/ebtables-save)
+ @$(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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCHv3] ebtables: this patch adds ebtables to ptxdist
2018-06-25 9:37 [ptxdist] [PATCHv3] ebtables: this patch adds ebtables to ptxdist Oliver Graute
@ 2018-06-25 14:27 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2018-06-25 14:27 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 25, 2018 at 11:37:43AM +0200, Oliver Graute wrote:
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
> .../ebtables-v2.0.10-4/0001-fixed-returncode.patch | 23 ++++++
> patches/ebtables-v2.0.10-4/series | 4 ++
> rules/ebtables.in | 12 ++++
> rules/ebtables.make | 82 ++++++++++++++++++++++
> 4 files changed, 121 insertions(+)
> create mode 100644 patches/ebtables-v2.0.10-4/0001-fixed-returncode.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.graute@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/series b/patches/ebtables-v2.0.10-4/series
> new file mode 100644
> index 0000000..05283fe
> --- /dev/null
> +++ b/patches/ebtables-v2.0.10-4/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-fixed-returncode.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..906e40e
> --- /dev/null
> +++ b/rules/ebtables.make
> @@ -0,0 +1,82 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@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 := GPL-2.0
> +
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
> +
> +EBTABLES_CONF_OPT := $(CROSS_AUTOCONF_USR)
This make no sense.
> +
> +EBTABLES_MAKE_ENV := \
> + $(CROSS_ENV)
> +
> +EBTABLES_MAKE_OPT := \
> + $(CROSS_CC_ENV)\
> + BINDIR=/usr/sbin
> +
Did you actually test this? Targetinstall fails because BINDIR is not set
correctly during install.
And the binaries have a broken rpath.
Michael
> +# ----------------------------------------------------------------------------
> +# 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.graute@neuhaus.de>")
> + @$(call install_fixup, ebtables,DESCRIPTION,missing)
> +
> + @$(call install_copy, ebtables, 0, 0, 0755, -, /usr/sbin/ebtables)
> + @$(call install_copy, ebtables, 0, 0, 0755, -, /usr/sbin/ebtables-restore)
> + @$(call install_copy, ebtables, 0, 0, 0755, -, /usr/sbin/ebtables-save)
> + @$(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
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-25 14:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-25 9:37 [ptxdist] [PATCHv3] ebtables: this patch adds ebtables to ptxdist Oliver Graute
2018-06-25 14:27 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox