Re: [ptxdist] [PATCH 2/2] OpenNHRP: added opennhrp rule file

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

On Thu, Feb 12, 2015 at 04:02:47PM +0100, Oliver Graute wrote:
> adding the rule file to ptxdist

Both files in one patch.

> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  rules/opennhrp.make |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 54 insertions(+)
>  create mode 100644 rules/opennhrp.make
> 
> diff --git a/rules/opennhrp.make b/rules/opennhrp.make
> new file mode 100644
> index 0000000..cdbd3d5
> --- /dev/null
> +++ b/rules/opennhrp.make
> @@ -0,0 +1,54 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 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_OPENNHRP) += opennhrp
> +
> +#
> +# Paths and names
> +#
> +OPENNHRP_VERSION	:= 0.14

Why not 0.14.1 ?

> +OPENNHRP_MD5		:= 62e8f16dd3bdf0600e43fcb37aa40462
> +OPENNHRP		:= opennhrp-$(OPENNHRP_VERSION)
> +OPENNHRP_SUFFIX	:= tar.bz2
> +OPENNHRP_URL		:= http://www.mirrorservice.org/sites/downloads.sourceforge.net/o/op/opennhrp/opennhrp/$(OPENNHRP).$(OPENNHRP_SUFFIX)

Use $(call ptx/mirror, SF, opennhrp/$(OPENNHRP).$(OPENNHRP_SUFFIX)), or
something like that.



> +OPENNHRP_SOURCE	:= $(SRCDIR)/$(OPENNHRP).$(OPENNHRP_SUFFIX)
> +OPENNHRP_DIR		:= $(BUILDDIR)/$(OPENNHRP)
> +OPENNHRP_LICENSE	:= MIT License
> +
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/opennhrp.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, opennhrp)
> +	@$(call install_fixup, opennhrp,PRIORITY,optional)
> +	@$(call install_fixup, opennhrp,SECTION,base)
> +	@$(call install_fixup, opennhrp,AUTHOR,"<oliver.graute@neuhaus.de>")
> +	@$(call install_fixup, opennhrp,DESCRIPTION,missing)
> +
> +	@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/nhrp/opennhrp, /usr/bin/opennhrp)

Use '-' for the source and it will look for the file in
platform-<XXX>/packages/opennhrp-0.14/ for the files:

	@$(call install_copy, opennhrp, 0, 0, 0755, -, /usr/sbin/opennhrp)


> +	@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/nhrp/opennhrpctl, /usr/bin/opennhrpctl)
> +	@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/opennhrp-script, /etc/opennhrp/opennhrp-script)

same here.

> +	#@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/opennhrp-script.cert, /etc/opennhrp/opennhrp-script.cert)

remove.

> +	#@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/opennhrp.conf, /etc/opennhrp/opennhrp.conf)

Is it usefull without a conf file?

Maybe:

	@$(call install_alternative, opennhrp, 0, 0, 0644, \
		/etc/opennhrp/opennhrp.conf)

It will use the example file as fallback but can be overwritten in
projectroot/

> +	@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/racoon-ph1dead.sh, /etc/opennhrp/racoon-ph1dead.sh)
> +	@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/racoon-ph1down.sh, /etc/opennhrp/racoon-ph1down.sh)

same as above again.

Michael

> +
> +	@$(call install_finish, opennhrp)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.9.5
> 
> 
> -- 
> 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