Re: [ptxdist] [PATCH 3/5] libnftnl: resolves new dependency on libnftnl by iptables

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

On Wed, Apr 06, 2016 at 05:20:25PM +0200, Andreas Geisenhainer wrote:
> Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
> ---
>  rules/libnftnl.in   | 26 +++++++++++++++++++++++++
>  rules/libnftnl.make | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 82 insertions(+)
>  create mode 100644 rules/libnftnl.in
>  create mode 100644 rules/libnftnl.make
> 
> diff --git a/rules/libnftnl.in b/rules/libnftnl.in
> new file mode 100644
> index 0000000..190e645
> --- /dev/null
> +++ b/rules/libnftnl.in
> @@ -0,0 +1,26 @@
> +## SECTION=networking
> +
> +menuconfig LIBNFTNL
> +	tristate
> +	select LIBMXML if LIBNFTNL_XML
> +	select JANSSON if LIBNFTNL_JSON
> +	prompt "libnftnl      "
> +	help
> +		libnftnl is a userspace library providing a low-level netlink
> +		programming interface (API) to the in-kernel nf_tables subsystem.
> +		The library libnftnl has been previously known as libnftables.
> +		This library is currently used by nftables.
> +
> +if LIBNFTNL
> +
> +config LIBNFTNL_XML
> +	bool
> +    depends on LIBNFTNL

Indent with <tab>.

> +	prompt "XML parsing support     "

No spaces at the end of the prompt. That is only used to align the '-->'
for 'menuconfig'.

> +
> +config LIBNFTNL_JSON
> +	bool
> +    depends on LIBNFTNL

Same here.

> +	prompt "JSON parsing support     "

Same here.

> +
> +endif
> diff --git a/rules/libnftnl.make b/rules/libnftnl.make
> new file mode 100644
> index 0000000..614c1ef
> --- /dev/null
> +++ b/rules/libnftnl.make
> @@ -0,0 +1,56 @@
> +# -*-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_LIBNFTNL) += libnftnl
> +
> +#
> +# Paths and names
> +#
> +LIBNFTNL_VERSION	:= 1.0.5
> +LIBNFTNL_MD5	:= af0c62ce6bbd7a7d39def0996c1c17c9
> +LIBNFTNL		:= libnftnl-$(LIBNFTNL_VERSION)
> +LIBNFTNL_SUFFIX	:= tar.bz2
> +LIBNFTNL_URL		:= http://ftp.netfilter.org/pub/libnftnl/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
> +LIBNFTNL_SOURCE	:= $(SRCDIR)/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
> +LIBNFTNL_DIR		:= $(BUILDDIR)/$(LIBNFTNL)
> +LIBNFTNL_LICENSE	:= GPL2

Use the SPDX identifier: GPL-2.0

Michael

> +
> +#
> +# autoconf
> +#
> +LIBNFTNL_CONF_TOOL	:= autoconf
> +LIBNFTNL_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/wwo, PTXCONF_LIBNFTNL_XML)-xml-parsing \
> +	--$(call ptx/wwo, PTXCONF_LIBNFTNL_JSON)-json-parsing
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libnftnl.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, libnftnl)
> +	@$(call install_fixup, libnftnl,PRIORITY,optional)
> +	@$(call install_fixup, libnftnl,SECTION,base)
> +	@$(call install_fixup, libnftnl,AUTHOR,"Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>")
> +	@$(call install_fixup, libnftnl,DESCRIPTION,missing)
> +
> +	@$(call install_lib, libnftnl, 0, 0, 0644, libnftnl)
> +
> +	@$(call install_finish, libnftnl)
> +
> +	@$(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