From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <551D0918.3070802@pengutronix.de> Date: Thu, 02 Apr 2015 11:17:12 +0200 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1427898579-5725-1-git-send-email-oliver.graute@neuhaus.de> <551CFF31.30700@pengutronix.de> In-Reply-To: <551CFF31.30700@pengutronix.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="===============0587231833==" 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) --===============0587231833== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2xc8Om0RMlRlhi0xw43fXPhNKe31rF67I" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2xc8Om0RMlRlhi0xw43fXPhNKe31rF67I Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 04/02/2015 10:34 AM, Marc Kleine-Budde wrote: > The package is not cross compiled, and the targetinstall stage fails. > Please test your package before posting. I'd better test my suggestions myself first. >> 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 >> >> 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 an= d >> + BOOTP broadcasts on directly connected subnets and relays them to D= HCP >> + 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. >=20 > please indent here with . >=20 >> 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 Germ= any, Oliver Graute >> +# >> +# See CREDITS for details about who has contributed to this project. >> +# >> +# For further information about the PTXdist project and license condi= tions >> +# 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) >=20 > Please remove the prepare stage, as the default (together with the > CONF_TOOL :=3D NO) works. >=20 >> + >> +# >> +# autoconf >> +# >> +DHCP_HELPER_CONF_TOOL :=3D NO >> +DHCP_HELPER_CONF_OPT :=3D \ >> + CROSS_COMPILE=3D$(COMPILER_PREFIX) PREFIX=3D/usr >=20 > ptxdist/ptxdist/.git/rebase-apply/patch:73: space before tab in indent.= > CROSS_COMPILE=3D$(COMPILER_PREFIX) PREFIX=3D/usr >=20 > 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: This is not correct, it should say: The correct option is "MAKE_OPT". The rationale is: MAKE_OPT is used in the compile stage (as args to make), while CONF_OPT is used in the prepare stage, as arguments to ./configure: This leads to a prepare stage like this (tested): > # ---------------------------------------------------------------------= ------- > # Prepare > # ---------------------------------------------------------------------= ------- >=20 > DHCP_HELPER_CONF_TOOL :=3D NO > DHCP_HELPER_MAKE_OPT :=3D \ > $(CROSS_ENV_CC) \ > PREFIX=3D/usr >=20 > DHCP_HELPER_INSTALL_OPT :=3D \ > $(DHCP_HELPER_MAKE_OPT) \ > install >=20 CROSS_ENV_CC is CC=3D$(COMPILER_PREFIX)gcc, as the unpatched makefile use= s CC directly, there's no CROSS_COMPILE: > all: dhcp-helper.c = =20 > $(CC) $(CFLAGS) $(RPM_OPT_FLAGS) -Wall -W dhcp-helper.c -o dhcp= -helper =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 | --2xc8Om0RMlRlhi0xw43fXPhNKe31rF67I 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 iQIcBAEBCgAGBQJVHQkbAAoJECte4hHFiupUJvoP/1wZKYSzBFQukaP9Ui7RtIO/ R5pRoF1CDKCeQUPQ7c2SXK0c1vtWDllYA+JIUqbBZmly/V1qoKf7xxYe5Fi4rL0v En8z47gQgXSEjre2Sjjyf+lv/kVV4Y4Oj/VO4Dotm6rREpdCXbLq88OQuR7wgjaQ wno1GnHKjsSmJwgc44uUAAW2YOMFe+cO5OMHcaTJdU/XZ1SNjb6K33eqxKQsnRS2 w+BrprnSpBm+YQ6mxTfO3hGS2bKEPkVGjv50tB5/7vjMgdoM5KHJ8EOry1Whe31E ZP1yCf7GB+eymqp7Ai3G6JUDtXQwYgBrwX7iWRvxfxX6Ureghx3+aOfdFPXot9St skL52iePrHsq60HXfvbmu1gc20Bb+1mAhweX29Db8TLAd9VUOiCbMa7j8+beJv+K wHVnn+Yy0Wfjw6SxzY461+3+uQnzDNatwcTkbD9Y8sHLZEhdZSnyw7ftE0IuGR0B ya2FlbU3OdPic7nvU7hPM5X9ESZWuLpdj/X9hUacv7d8ZHsS+bzks8pDv7opaGZ0 YJeq1hFbLuJ68nNblMpjKLZnD2BbMrY4ZXd7B/UujtqsXEH23pO2RZ356bpo2yvb WPkzvvqyHp5rDxMzjNyEYhj6+UwMDqOq8Nnugw2R1/G2T/rKmgHuGoV+zhhZYifh r9vyS16dsCcPuz7W839P =oX4o -----END PGP SIGNATURE----- --2xc8Om0RMlRlhi0xw43fXPhNKe31rF67I-- --===============0587231833== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0587231833==--