Re: [ptxdist] [PATCH 4/5] nftables: adds new package nftables in version 0.5

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Apr 06, 2016 at 05:20:26PM +0200, Andreas Geisenhainer wrote:
> Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
> ---
>  rules/nftables.in   | 35 ++++++++++++++++++++++++++++++
>  rules/nftables.make | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 97 insertions(+)
>  create mode 100644 rules/nftables.in
>  create mode 100644 rules/nftables.make
> 
> diff --git a/rules/nftables.in b/rules/nftables.in
> new file mode 100644
> index 0000000..630530f
> --- /dev/null
> +++ b/rules/nftables.in
> @@ -0,0 +1,35 @@
> +## SECTION=networking
> +
> +menuconfig NFTABLES
> +	tristate
> +	prompt "nftables                    "
> +	select LIBGMP if !NFTABLES_MGMP
> +    select READLINE

Indent with <tab>

> +	select LIBMNL
> +	select LIBNFTNL
> +	help
> +	  nftables is the project that aims to replace the existing
> +	  {ip,ip6,arp,eb}tables framework. Basically, this project provides
> +	  a new packet filtering framework, a new userspace utility and also
> +	  a compatibility layer for {ip,ip6}tables. nftables is built upon
> +	  the building blocks of the Netfilter infrastructure such as the
> +	  existing hooks, the connection tracking system, the userspace
> +	  queueing component and the logging subsystem.
> +	  Don't forget to enable nf_tables in kernel.
> +
> +if NFTABLES
> +
> +config NFTABLES_DEBUG
> +    bool
> +    default y
> +    prompt "enable debug"
> +
> +# broken in v0.5 (seems to be fixed some time after)
> +# config NFTABLES_MGMP
> +# 	bool
> +# 	prompt "use mini-GMP"
> +# 	help
> +# 	  use the nftables build-in mini-GMP instead of linking to the shared
> +# 	  libgmp. (may reduce debugging verbosity on some files)


add the option normally and then add:

	# broken in v0.5 (seems to be fixed some time after)
	depends on BROKEN

> +
> +endif
> diff --git a/rules/nftables.make b/rules/nftables.make
> new file mode 100644
> index 0000000..f5c94f1
> --- /dev/null
> +++ b/rules/nftables.make
> @@ -0,0 +1,62 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2016 by Andreas Geisenhainer <andreas.geisenhainer@atsonline.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_NFTABLES) += nftables
> +
> +#
> +# Paths and names
> +#
> +NFTABLES_VERSION	:= 0.5
> +NFTABLES_MD5		:= 94bfe1c54bcb9f6ed974835f2fca8069
> +NFTABLES		:= nftables-$(NFTABLES_VERSION)
> +NFTABLES_SUFFIX		:= tar.bz2
> +NFTABLES_URL		:= http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX)
> +NFTABLES_SOURCE		:= $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX)
> +NFTABLES_DIR		:= $(BUILDDIR)/$(NFTABLES)
> +NFTABLES_LICENSE	:= GPL-2.0
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +NFTABLES_CONF_TOOL	:= autoconf
> +NFTABLES_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/endis, PTXCONF_NFTABLES_DEBUG)-debug
> +
> +# broken in v0.5 (mini-gmp.h missing), seems to be fixed in newer releases
> +#	--$(call ptx/wwo, PTXCONF_NFTABLES_MGMP)-mini-gmp

Just add it normally. It will always generate 'without' for now.

> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/nftables.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, nftables)
> +	@$(call install_fixup, nftables,PRIORITY,optional)
> +	@$(call install_fixup, nftables,SECTION,base)
> +	@$(call install_fixup, nftables,AUTHOR,"Andreas Geisenhainer <andreas.geisenhainer@atsonline.de")
> +	@$(call install_fixup, nftables,DESCRIPTION,missing)
> +
> +	@$(call install_copy, nftables, 0, 0, 0755, $(NFTABLES_DIR)/src/nft, /usr/sbin/nft)

Don't use NFTABLES_DIR here. "make install" should produce something useful
in the install stage.

Michael

> +
> +	@$(call install_finish, nftables)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.8.0.rc3
> 
> ____________
> Virus checked by G Data MailSecurity
> Version: AVA 25.6071 dated 06.04.2016
> Virus news: www.antiviruslab.com.
> 
> _______________________________________________
> 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