Re: [ptxdist] [PATCH] vrrpd: add vrrpd as specified in rfc2338 to ptxdist

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

On Thu, Dec 10, 2015 at 09:44:54AM +0100, Oliver Graute wrote:
> VRRPd is an implementation of VRRPv2 as specified in rfc2338.
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  ...-fix-undefined-reference-to-clock_gettime.patch |   21 +++++
>  patches/Vrrpd-1.13/series                          |    1 +
>  rules/vrrpd.in                                     |    9 ++
>  rules/vrrpd.make                                   |   88 ++++++++++++++++++++
>  4 files changed, 119 insertions(+)
>  create mode 100644 patches/Vrrpd-1.13/0001-fix-undefined-reference-to-clock_gettime.patch
>  create mode 100644 patches/Vrrpd-1.13/series
>  create mode 100644 rules/vrrpd.in
>  create mode 100644 rules/vrrpd.make
> 
> diff --git a/patches/Vrrpd-1.13/0001-fix-undefined-reference-to-clock_gettime.patch b/patches/Vrrpd-1.13/0001-fix-undefined-reference-to-clock_gettime.patch

Add a proper patch header

> new file mode 100644
> index 0000000..f99a08f
> --- /dev/null
> +++ b/patches/Vrrpd-1.13/0001-fix-undefined-reference-to-clock_gettime.patch
> @@ -0,0 +1,21 @@
> +From: Oliver Graute <oliver.graute@neuhaus.de>
> +Date: Thu, 9 Jul 2015 11:12:41 +0200
> +Subject: [PATCH] fix undefined reference to clock_gettime
> +
> +---
> + Makefile |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 9278378..c57bd71 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -26,7 +26,7 @@ vrrpd : $(VRRPD_OBJS)
> + 	$(CC) $(PROF_OPT) -o $@ $^ -lrt $(LINKLIB)
> + 
> + atropos:$(ATROPOS_OBJS)
> +-	$(CC) $(PROF_OPT) -o $@ -lrt $^
> ++	$(CC) $(PROF_OPT) -o $@ $^ -lrt
> + 
> + vrrpd.o: vrrpd.h 
> + libnetlink.o: libnetlink.h
> diff --git a/patches/Vrrpd-1.13/series b/patches/Vrrpd-1.13/series
> new file mode 100644
> index 0000000..7970a7a
> --- /dev/null
> +++ b/patches/Vrrpd-1.13/series
> @@ -0,0 +1 @@
> +0001-fix-undefined-reference-to-clock_gettime.patch
> diff --git a/rules/vrrpd.in b/rules/vrrpd.in
> new file mode 100644
> index 0000000..e94111b
> --- /dev/null
> +++ b/rules/vrrpd.in
> @@ -0,0 +1,9 @@
> +## SECTION=networking
> +
> +config VRRPD
> +	tristate
> +	prompt "vrrpd"
> +	help
> +	  VRRPd is an implementation of VRRPv2 as specified in rfc2338. It run
> +	  in userspace for linux. In short, VRRP is a protocol which elects a
> +	  master server on a LAN. If the master fails, a backup server takes over.
> diff --git a/rules/vrrpd.make b/rules/vrrpd.make
> new file mode 100644
> index 0000000..aa97970
> --- /dev/null
> +++ b/rules/vrrpd.make
> @@ -0,0 +1,88 @@
> +# -*-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_VRRPD) += vrrpd
> +
> +#
> +# Paths and names
> +#
> +VRRPD_VERSION	:= 1.13
> +VRRPD_MD5	:= c77e5424407e9a40abfd7d95c16336d6
> +VRRPD		:= Vrrpd-$(VRRPD_VERSION)
> +VRRPD_SUFFIX	:= tar.gz
> +VRRPD_URL	:= https://github.com/fredbcode/Vrrpd/archive/v$(VRRPD_VERSION).$(VRRPD_SUFFIX)
> +VRRPD_SOURCE	:= $(SRCDIR)/$(VRRPD).$(VRRPD_SUFFIX)
> +VRRPD_DIR	:= $(BUILDDIR)/$(VRRPD)
> +VRRPD_LICENSE	:= GPLv2

GPL-2.0 (we use SPDX license identifiers now)

> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +VRRPD_CONF_ENV	:= $(CROSS_ENV)
> +
> +VRRPD_CONF_TOOL   :=  NO
> +VRRPD_MAKE_OPT    := \
> +	$(CROSS_ENV_CC) \
> +	PREFIX=/usr
> +VRRPD_INSTALL_OPT := \
> +	$(DHCP_HELPER_MAKE_OPT) \

This should be VRRPD_MAKE_OPT right?

See my comments to the other patches for the rest.

Michael


> +	install
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/vrrpd.compile:
> +	@$(call targetinfo)
> +	@$(call world/compile, VRRPD)
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/vrrpd.install:
> +#	@$(call targetinfo)
> +#	@$(call world/install, VRRPD)
> +#	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/vrrpd.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, vrrpd)
> +	@$(call install_fixup, vrrpd,PRIORITY,optional)
> +	@$(call install_fixup, vrrpd,SECTION,base)
> +	@$(call install_fixup, vrrpd,AUTHOR,"oliver.graute@neuhaus.de")
> +	@$(call install_fixup, vrrpd,DESCRIPTION,missing)
> +
> +	@$(call install_copy, vrrpd, 0, 0, 0755, $(VRRPD_DIR)/vrrpd, /usr/sbin/vrrpd)
> +	@$(call install_copy, vrrpd, 0, 0, 0755, $(VRRPD_DIR)/atropos, /usr/sbin/atropos)
> +
> +	@$(call install_finish, vrrpd)
> +
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/vrrpd.clean:
> +#	@$(call targetinfo)
> +#	@$(call clean_pkg, VRRPD)
> +
> +# 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