Sean Bruno <sbr...@freebsd.org> wrote:

> Author: sbruno
> Date: Tue Sep 12 23:36:58 2017
> New Revision: 323509
> URL: https://svnweb.freebsd.org/changeset/base/323509
> 
> Log:
>   The diff is the initial submission of Cavium Liquidio 2350/2360 10/25G
>   Intelligent NIC driver.
>   
>   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
From e7642d301f1cf647f6b0e5898a5a708958d73504 Mon Sep 17 00:00:00 2001
From: Fabian Keil <f...@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 blobs

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=		ixl
 _ixlv=		ixlv
 _linux64=	linux64
 _linux_common=	linux_common
+.if ${MK_SOURCELESS_UCODE} != "no"
 _lio=		lio
+.endif
 _ntb=		ntb
 _pms=		pms
 _qlxge=		qlxge
-- 
2.14.1

Attachment: pgprYXh78f5qM.pgp
Description: OpenPGP digital signature

Reply via email to