From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <551CFF31.30700@pengutronix.de> Date: Thu, 02 Apr 2015 10:34:57 +0200 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1427898579-5725-1-git-send-email-oliver.graute@neuhaus.de> In-Reply-To: <1427898579-5725-1-git-send-email-oliver.graute@neuhaus.de> Subject: Re: [ptxdist] [PATCHv3 1/1] dhcp-helper: this patch adds dhcp-helper to ptxdist Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1547238282==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1547238282== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DBeoGMnS7xhD7r06HxjdnnK4ROoacvVf7" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --DBeoGMnS7xhD7r06HxjdnnK4ROoacvVf7 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 04/01/2015 04:29 PM, Oliver Graute wrote: > This patch adds dhcp-helper a DHCP and BOOTP relay agent to ptxdist The package is not cross compiled, and the targetinstall stage fails. Please test your package before posting. > Signed-off-by: Oliver Graute > --- > rules/dhcp-helper.in | 12 ++++++++ > rules/dhcp-helper.make | 74 ++++++++++++++++++++++++++++++++++++++++= ++++++++ > 2 files changed, 86 insertions(+) > create mode 100644 rules/dhcp-helper.in > create mode 100644 rules/dhcp-helper.make >=20 > 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=3Dnetworking > + > +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 DH= CP > + 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. please indent here with . > diff --git a/rules/dhcp-helper.make b/rules/dhcp-helper.make > new file mode 100644 > index 0000000..38a2eb2 > --- /dev/null > +++ b/rules/dhcp-helper.make > @@ -0,0 +1,74 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germa= ny, Oliver Graute > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license condit= ions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_DHCP_HELPER) +=3D dhcp-helper > + > +# > +# Paths and names > +# > +DHCP_HELPER_VERSION :=3D 1.1 > +DHCP_HELPER_MD5 :=3D d749a53d8b488b6a15b7400185b99bb3 > +DHCP_HELPER :=3D dhcp-helper-$(DHCP_HELPER_VERSION) > +DHCP_HELPER_SUFFIX :=3D tar.gz > +DHCP_HELPER_URL :=3D http://www.thekelleys.org.uk/dhcp-helper/$(DHCP_= HELPER).$(DHCP_HELPER_SUFFIX) > +DHCP_HELPER_SOURCE :=3D $(SRCDIR)/$(DHCP_HELPER).$(DHCP_HELPER_SUFFIX)= > +DHCP_HELPER_DIR :=3D $(BUILDDIR)/$(DHCP_HELPER) > +DHCP_HELPER_LICENSE :=3D GPLv2 > + > +# --------------------------------------------------------------------= -------- > +# Prepare > +# --------------------------------------------------------------------= -------- > + > +$(STATEDIR)/dhcp-helper.prepare: > + @$(call targetinfo) > + @$(call clean, $(DHCP_HELPER_DIR)/config.cache) > + @$(call touch) Please remove the prepare stage, as the default (together with the CONF_TOOL :=3D NO) works. > + > +# > +# autoconf > +# > +DHCP_HELPER_CONF_TOOL :=3D NO > +DHCP_HELPER_CONF_OPT :=3D \ > + CROSS_COMPILE=3D$(COMPILER_PREFIX) PREFIX=3D/usr ptxdist/ptxdist/.git/rebase-apply/patch:73: space before tab in indent. CROSS_COMPILE=3D$(COMPILER_PREFIX) PREFIX=3D/usr The correct option is "COMPILE_OPT". The rationale is: COMPILE_OPT is used in the compile stage (as args to make), while CONF_OPT is used in the prepare stage, as arguments to ./configure: DHCP_HELPER_COMPILE_OPT : \ CROSS_COMPILE=3D$(COMPILER_PREFIX) \ PREFIX=3D/usr > +DHCP_HELPER_INSTALL_OPT :=3D $(COMPILE_OPT) Please add "install": DHCP_HELPER_INSTALL_OPT :=3D \ $(COMPILE_OPT) \ install > + > + > +# --------------------------------------------------------------------= -------- > +# Compile > +# --------------------------------------------------------------------= -------- > + > +$(STATEDIR)/dhcp-helper.compile: > + @$(call targetinfo) > + @$(call world/compile, DHCP_HELPER) > + @$(call touch) please remove, as the default works. > + > +# --------------------------------------------------------------------= -------- > +# 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,"= ") > + @$(call install_fixup, dhcp-helper,DESCRIPTION,missing) > + > + @$(call install_copy, dhcp-helper, 0, 0, 0755, -, /usr/local/sbin/dhc= p-helper) ^^^^^ When setting PREFIX=3D/usr this will be installed into /usr/sbin. (But th= e PREFIX=3D/usr never reached the install stage, see above) > + > + @$(call install_finish, dhcp-helper) > + > + @$(call touch) > + > +# vim: syntax=3Dmake >=20 Marc --=20 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 | --DBeoGMnS7xhD7r06HxjdnnK4ROoacvVf7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJVHP87AAoJECte4hHFiupUug4P/AjirQxWjPCYuwffECiw+zYA FtUxSxzkP7yhMKp53m8PeYNMs2HegoDwU5mJpt5WSy2a0oJ1vGbzNzUnYgIcMXn3 1Y4bMe7Y6hnrSVeNtIn8ZAbEWJhrSeuyQyG0rNcWXOS4uexlFybAaeG19QEi9cuM E7zpO6rDwlGZ2fZDaM3cQtMkvE1e7Qya7z6em/ISVNP858E5mvREIloKdPp9XSft Pi6CtAR8DkL38Zlc3a6AYRMOQQhHk8mkBsN8MIvAqgrqMQf94AIM9HnPDObHnvxO ZQla0bsDm39ECeRM50AyUw+SoofzEtzVo2JLTYdaRi4XFGOk5TAHNfHOzDqu2SHd vJ6lQkLLSoJKn2twLnf+JE0UljhUABZ5HsX6BWqUS2qogc5jxE3DZB0R+3S94sfU JwGEABpAvWSl+1Fp5vzfVOvADykPVm9Ab2V+8DSMs3WbJPwmO2fj5v7BAOv4QsZS hntaZq7jkqlh1DkXk8lVL/OH0+aTqr/e2p0kJ82FBssmveVPtNLggxvmyx73WcOB AywKeUPKwqtCrOATFJdg/mf3+iDDIxxrhlrjhugEdmlSYPf70KM7mqnU3ZSSgXjh HFeNS/alYGQj983a6ghHdoBtw1qg9D38sd6RmHlOLDBZjfIA6LXPjr0Koy+Sn0wr HsegL46cRYGDvcVBzxfv =oRki -----END PGP SIGNATURE----- --DBeoGMnS7xhD7r06HxjdnnK4ROoacvVf7-- --===============1547238282== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1547238282==--