Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Sep 2017 08:11:04 +0200
From:      Fabian Keil <freebsd-listen@fabiankeil.de>
To:        Sean Bruno <sbruno@FreeBSD.org>
Cc:        Prasad V Kanneganti <pkanneganti@cavium.com>, svn-src-all@freebsd.org
Subject:   Re: svn commit: r323509 - in head: share/man/man4 sys/conf sys/contrib/dev/liquidio sys/dev/liquidio sys/dev/liquidio/base sys/modules sys/modules/lio
Message-ID:  <20170913081104.09ca9446@fabiankeil.de>
In-Reply-To: <201709122336.v8CNaw9B088517@repo.freebsd.org>
References:  <201709122336.v8CNaw9B088517@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/3vGldvIBQi1iX6hhTxnbdZv
Content-Type: multipart/mixed; boundary="MP_/ES3C/RHPqZjNG/B4EIejO+3"

--MP_/ES3C/RHPqZjNG/B4EIejO+3
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Sean Bruno <sbruno@FreeBSD.org> wrote:

> Author: sbruno
> Date: Tue Sep 12 23:36:58 2017
> New Revision: 323509
> URL: https://svnweb.freebsd.org/changeset/base/323509
>=20
> Log:
>   The diff is the initial submission of Cavium Liquidio 2350/2360 10/25G
>   Intelligent NIC driver.
>  =20
>   The submission conconsists of firmware binary file and driver sources.

Unless I missed it, the license for the blob isn't explicitly documented.
Is the blob supposed to be covered by the same "BSD LICENSE" as the driver
source files?

> Added:
>   head/share/man/man4/liquidio.4   (contents, props changed)
>   head/sys/contrib/dev/liquidio/
>   head/sys/contrib/dev/liquidio/lio_23xx_nic.bin.uu
[...]
>   head/sys/modules/lio/Makefile   (contents, props changed)

WITHOUT_SOURCELESS_UCODE isn't respected.
The attached patch fixes this.

Fabian

--MP_/ES3C/RHPqZjNG/B4EIejO+3
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename=0001-Don-t-try-to-build-lio-if-the-user-objects-to-binary-.diff

=46rom e7642d301f1cf647f6b0e5898a5a708958d73504 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 13 Sep 2017 07:36:20 +0200
Subject: [PATCH] Don't (try to) build lio if the user objects to binary blo=
bs

The problem was introduced in r323509/5543e587c7.

Obtained from: ElectroBSD
---
 sys/modules/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 43d3bd9308c9..3b607c7a647b 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -711,7 +711,9 @@ _ixl=3D		ixl
 _ixlv=3D		ixlv
 _linux64=3D	linux64
 _linux_common=3D	linux_common
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _lio=3D		lio
+.endif
 _ntb=3D		ntb
 _pms=3D		pms
 _qlxge=3D		qlxge
--=20
2.14.1


--MP_/ES3C/RHPqZjNG/B4EIejO+3--

--Sig_/3vGldvIBQi1iX6hhTxnbdZv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQTKUNd6H/m3+ByGULIFiohV/3dUnQUCWbjL+AAKCRAFiohV/3dU
nU+LAJ9QfNLKelVXGdovrdYMAWLsiVlVxQCghUYmNcUTox5rYczKWuhy4Z+GDzU=
=JstM
-----END PGP SIGNATURE-----

--Sig_/3vGldvIBQi1iX6hhTxnbdZv--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170913081104.09ca9446>