* Re: [ptxdist] [PATCHv2] dhcp-helper: this patch adds dhcp-helper to ptxdist
2015-03-31 13:51 [ptxdist] [PATCHv2] dhcp-helper: this patch adds dhcp-helper to ptxdist Oliver Graute
@ 2015-03-31 17:07 ` Marc Kleine-Budde
0 siblings, 0 replies; 2+ messages in thread
From: Marc Kleine-Budde @ 2015-03-31 17:07 UTC (permalink / raw)
To: ptxdist; +Cc: Oliver Graute
[-- Attachment #1.1: Type: text/plain, Size: 4735 bytes --]
On 03/31/2015 03:51 PM, Oliver Graute wrote:
> This patch adds dhcp-helper a DHCP and BOOTP relay agent to ptxdist
>
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
> rules/dhcp-helper.in | 12 ++++++++++
> rules/dhcp-helper.make | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 73 insertions(+)
> create mode 100644 rules/dhcp-helper.in
> create mode 100644 rules/dhcp-helper.make
>
> diff --git a/rules/dhcp-helper.in b/rules/dhcp-helper.in
> new file mode 100644
> index 0000000..b55755b
> --- /dev/null
> +++ b/rules/dhcp-helper.in
> @@ -0,0 +1,12 @@
> +## SECTION=networking
> +
> +config DHCP_HELPER
> + tristate
> + prompt "dhcp-helper"
> + help
> + dhcp-helper is a DHCP and BOOTP relay agent. It listens for DHCP and
> + BOOTP broadcasts on directly connected subnets and relays them to DHCP
> + or BOOTP servers elsewhere. It also relays replies from the remote
> + servers back to partially configured hosts. Once hosts are fully
> + configured they can communicate directly with their servers and no
> + longer need the services of a relay.
> diff --git a/rules/dhcp-helper.make b/rules/dhcp-helper.make
> new file mode 100644
> index 0000000..fa01e4a
> --- /dev/null
> +++ b/rules/dhcp-helper.make
> @@ -0,0 +1,60 @@
> +# -*-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_DHCP_HELPER) += dhcp-helper
> +
> +#
> +# Paths and names
> +#
> +DHCP_HELPER_VERSION := 1.1
> +DHCP_HELPER_MD5 := 049cc2138f151235903d2303a57f8203
ptxdist: error: Wrong md5sum for 'dhcp-helper' (src/dhcp-helper-1.1.tar.gz)
> +DHCP_HELPER := dhcp-helper-$(DHCP_HELPER_VERSION)
> +DHCP_HELPER_SUFFIX := tar.gz
> +DHCP_HELPER_URL := http://www.thekelleys.org.uk/dhcp-helper/$(DHCP_HELPER).$(DHCP_HELPER_SUFFIX)
> +DHCP_HELPER_SOURCE := $(SRCDIR)/$(DHCP_HELPER).$(DHCP_HELPER_SUFFIX)
> +DHCP_HELPER_DIR := $(BUILDDIR)/$(DHCP_HELPER)
> +DHCP_HELPER_LICENSE := GPLv2
> +
Please add the usual prepare header here
> +DHCP_HELPER_CONF_ENV := $(CROSS_ENV)
please remove, as this is default
> +
> +DHCP_HELPER_CONF_OPT := $(CROSS_AUTOCONF_USR)
I see no configure script in the sources, so _CONF_TOOL := NO would be
the right option here.
Are you sure the package is properly cross compiled? I think you have to
add a COMPILE_OPT := CROSS_COMPILE=$(COMPILER_PREFIX) PREFIX=/usr, as in
the opennhrp package. Further, consider to add a INSTALL_OPT :=
$(COMPILE_OPT) install. This way the install stage of the package will
do the right thing and you can use the standard "-" trick in the
targetinstall stage (see below)
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/dhcp-helper.compile:
> + @$(call targetinfo)
> + @$(call world/compile, DHCP_HELPER)
> + @$(call touch
ptxdist/ptxdist/rules/dhcp-helper.make:37: *** unterminated call to
function 'call': missing ')'. Stop.
Please test the rules before sending patches.
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/dhcp-helper.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, dhcp-helper)
> + @$(call install_fixup, dhcp-helper,PRIORITY,optional)
> + @$(call install_fixup, dhcp-helper,SECTION,base)
> + @$(call install_fixup, dhcp-helper,AUTHOR,"<oliver.graute@neuhaus.de>")
> + @$(call install_fixup, dhcp-helper,DESCRIPTION,missing)
> +
> + @$(call install_copy, dhcp-helper, 0, 0, 0755, $(DHCP_HELPER_DIR)/dhcp-helper, /usr/bin/dhcp-helper)
The package itself installs into _s_bin, you might follow this
suggestion. With the INSTALL_OPT as noted, this should work:
@$(call install_copy, dhcp-helper, 0, 0, 0755, -,
/usr/sbin/dhcp-helper)
> +
> + @$(call install_finish, dhcp-helper)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread