From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: References: <20190312090358.18517-1-o.rempel@pengutronix.de> From: Marc Kleine-Budde Message-ID: <97ee1a27-72dd-8641-6175-78446a0a8bfc@pengutronix.de> Date: Tue, 12 Mar 2019 15:47:18 +0100 MIME-Version: 1.0 In-Reply-To: <20190312090358.18517-1-o.rempel@pengutronix.de> Subject: Re: [ptxdist] [PATCH] update berlios-can-utils to the latest git version List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============1888259789==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de, Oleksij Rempel This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1888259789== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DjYGN5UaceH3QgjEAthi4Ocr4jr4TTsFN" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --DjYGN5UaceH3QgjEAthi4Ocr4jr4TTsFN Content-Type: multipart/mixed; boundary="dnorCIcpL6CGbdfVyDnwcO6FtgPCk5P1i"; protected-headers="v1" From: Marc Kleine-Budde To: ptxdist@pengutronix.de, Oleksij Rempel Message-ID: <97ee1a27-72dd-8641-6175-78446a0a8bfc@pengutronix.de> Subject: Re: [ptxdist] [PATCH] update berlios-can-utils to the latest git version References: <20190312090358.18517-1-o.rempel@pengutronix.de> In-Reply-To: <20190312090358.18517-1-o.rempel@pengutronix.de> --dnorCIcpL6CGbdfVyDnwcO6FtgPCk5P1i Content-Type: text/plain; charset=utf-8 Content-Language: de-DE Content-Transfer-Encoding: quoted-printable On 3/12/19 10:03 AM, Oleksij Rempel wrote: > it will also add support for j1939 utils >=20 > Signed-off-by: Oleksij Rempel > --- > rules/berlios-can-utils.in | 81 ++++++++++++++++--------------------= > rules/berlios-can-utils.make | 30 ++++++++++--- > 2 files changed, 62 insertions(+), 49 deletions(-) >=20 > diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in > index 914d91707..cbf5ebb3f 100644 > --- a/rules/berlios-can-utils.in > +++ b/rules/berlios-can-utils.in > @@ -10,91 +10,84 @@ menuconfig BERLIOS_CAN_UTILS > if BERLIOS_CAN_UTILS > =20 > config BERLIOS_CAN_UTILS_ASC2LOG > - bool > - prompt "asc2log" > + bool asc2log > =20 > config BERLIOS_CAN_UTILS_BCMSERVER > - bool > - prompt "bcmserver" > + bool bcmserver > =20 > config BERLIOS_CAN_UTILS_CANBUSLOAD > - bool > - prompt "canbusload" > + bool canbusload > =20 > config BERLIOS_CAN_UTILS_CANDUMP > - bool > - prompt "candump" > + bool candump > =20 > config BERLIOS_CAN_UTILS_CANFDTEST > - bool > - prompt "canfdtest" > + bool canfdtest > =20 > config BERLIOS_CAN_UTILS_CANGEN > - bool > - prompt "cangen" > + bool cangen > =20 > config BERLIOS_CAN_UTILS_CANGW > - bool > - prompt "cangw" > + bool cangw > =20 > config BERLIOS_CAN_UTILS_CANLOGSERVER > - bool > - prompt "canlogserver" > + bool canlogserver > =20 > config BERLIOS_CAN_UTILS_CANPLAYER > - bool > - prompt "canplayer" > + bool canplayer > =20 > config BERLIOS_CAN_UTILS_CANSEND > - bool > - prompt "cansend" > + bool cansend > =20 > config BERLIOS_CAN_UTILS_CANSNIFFER > - bool > - prompt "cansniffer" > + bool cansniffer > =20 > config BERLIOS_CAN_UTILS_ISOTPDUMP > - bool > - prompt "isotpdump" > + bool isotpdump > =20 > config BERLIOS_CAN_UTILS_ISOTPRECV > - bool > - prompt "isotprecv" > + bool isotprecv > =20 > config BERLIOS_CAN_UTILS_ISOTPSEND > - bool > - prompt "isotpsend" > + bool isotpsend > =20 > config BERLIOS_CAN_UTILS_ISOTPSERVER > - bool > - prompt "isotpserver" > + bool isotpserver > =20 > config BERLIOS_CAN_UTILS_ISOTPSNIFFER > - bool > - prompt "isotpsniffer" > + bool isotpsniffer > =20 > config BERLIOS_CAN_UTILS_ISOTPTUN > - bool > - prompt "isotptun" > + bool isotptun > =20 > config BERLIOS_CAN_UTILS_LOG2ASC > - bool > - prompt "log2asc" > + bool log2asc > =20 > config BERLIOS_CAN_UTILS_LOG2LONG > - bool > - prompt "log2long" > + bool log2long > =20 > config BERLIOS_CAN_UTILS_SLCAN_ATTACH > - bool > - prompt "slcan_attach" > + bool slcan_attach > =20 > config BERLIOS_CAN_UTILS_SLCAND > - bool > - prompt "slcand" > + bool slcand > =20 > config BERLIOS_CAN_UTILS_SLCANPTY > - bool > - prompt "slcanpty" > + bool slcanpty > + > +config BERLIOS_CAN_UTILS_JSPY > + bool jspy > + > +config BERLIOS_CAN_UTILS_JSR > + bool jsr > + > +config BERLIOS_CAN_UTILS_JACD > + bool jacd > + > +config BERLIOS_CAN_UTILS_JCAT > + bool jcat > + > +config BERLIOS_CAN_UTILS_TESTJ1939 > + bool testj1939 > =20 > endif > diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.mak= e > index d8a7cff35..794235231 100644 > --- a/rules/berlios-can-utils.make > +++ b/rules/berlios-can-utils.make > @@ -16,20 +16,35 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) +=3D berlios-= can-utils > # > # Paths and names > # > -BERLIOS_CAN_UTILS_VERSION :=3D 2014.01.0 > -BERLIOS_CAN_UTILS_MD5 :=3D f643449f6607688a9f4662a48bc91aa0 > -BERLIOS_CAN_UTILS :=3D can-utils-$(BERLIOS_CAN_UTILS_VERSION) > +BERLIOS_CAN_UTILS_VERSION :=3D b6cb9a04e5 > +BERLIOS_CAN_UTILS_MD5 :=3D f1eef88eaad92e3c3ab4c08ef827ba84 > +BERLIOS_CAN_UTILS :=3D canutils-$(BERLIOS_CAN_UTILS_VERSION) > BERLIOS_CAN_UTILS_SUFFIX :=3D tar.bz2 > -BERLIOS_CAN_UTILS_URL :=3D http://www.pengutronix.de/software/ptxdist= /temporary-src/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX) > +BERLIOS_CAN_UTILS_URL :=3D https://github.com/linux-can/can-utils.git= ;tag=3D$(BERLIOS_CAN_UTILS_VERSION) > BERLIOS_CAN_UTILS_SOURCE :=3D $(SRCDIR)/$(BERLIOS_CAN_UTILS).$(BERLIOS= _CAN_UTILS_SUFFIX) > BERLIOS_CAN_UTILS_DIR :=3D $(BUILDDIR)/$(BERLIOS_CAN_UTILS) > -BERLIOS_CAN_UTILS_LICENSE :=3D unknown > +BERLIOS_CAN_UTILS_LICENSE :=3D GPL-2.0 > + > +# --------------------------------------------------------------------= -------- > +# Extract (just create the 'configure' script on demand) > +# --------------------------------------------------------------------= -------- > + > +$(STATEDIR)/berlios-can-utils.extract.post: $(STATEDIR)/autogen-tools > + @$(call targetinfo) > + @cd $(BERLIOS_CAN_UTILS_DIR) && [ -f configure ] || sh autogen.sh > + @$(call world/patchin/post, BERLIOS_CAN_UTILS) > + @$(call touch) Create a patches/can-utils-b6cb9a04e5 dir and link to ../autogen.sh > =20 > # --------------------------------------------------------------------= -------- > # Prepare > # --------------------------------------------------------------------= -------- > =20 > +BERLIOS_CAN_UTILS_CONF_ENV :=3D \ > + $(CROSS_ENV) \ > + CPPFLAGS=3D"-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)" That should not be needed. > + > BERLIOS_CAN_UTILS_CONF_TOOL :=3D autoconf > +BERLIOS_CAN_UTILS_CONF_OPT :=3D $(CROSS_AUTOCONF_USR) > =20 > # --------------------------------------------------------------------= -------- > # Target-Install > @@ -59,6 +74,11 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_L= OG2LONG) +=3D /usr/bin/log2lon > BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) +=3D = /usr/bin/slcan_attach > BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAND) +=3D /usr/b= in/slcand > BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCANPTY) +=3D /usr= /bin/slcanpty > +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSPY) +=3D /usr/bin= /jspy > +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSR) +=3D /usr/bin/= jsr > +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JACD) +=3D /usr/bin= /jacd > +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JCAT) +=3D /usr/bin= /jcat > +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) +=3D /us= r/bin/testj1939 > =20 > $(STATEDIR)/berlios-can-utils.targetinstall: > @$(call targetinfo) >=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 | --dnorCIcpL6CGbdfVyDnwcO6FtgPCk5P1i-- --DjYGN5UaceH3QgjEAthi4Ocr4jr4TTsFN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEmvEkXzgOfc881GuFWsYho5HknSAFAlyHxnYACgkQWsYho5Hk nSCAegf/VQICR5trgcqv3h85CnYJyKGnuuRzlTGv8ic3u4C5mjiF5/g0VxHrH+TD teUeAk/BovpXwk83111KAmN8kSkWQ+7ZfxyCbcxGfeHejiwR95OVv5SkXJ4BzQbu pyL1epxkG6qh5bEA4s2DLCIMYhaSY9gnv750EzQcfTdvtDXfDn65OOZt5vg5ssBU GBgpV1C1z9iAgTlgKiEzJotxQ6ndF7xBAks04SleR/1A9YVzUaO67nj1nD6OBMUQ hLrHCtT93rFsLw1ng8M4yQ2Gptye0mcCTwDNiR/dFDUo8dbKdgID+dDAjF54WeJ+ 3e7+dJGPR0RjAONV0tSiW+9tivJLLQ== =Udlp -----END PGP SIGNATURE----- --DjYGN5UaceH3QgjEAthi4Ocr4jr4TTsFN-- --===============1888259789== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ== --===============1888259789==--