Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jan 2012 16:01:26 +0100
From:      Robert Millan <rmh@freebsd.org>
To:        d@delphij.net
Cc:        Kostik Belousov <kostikbel@gmail.com>, Adrian Chadd <adrian@freebsd.org>, freebsd-arch@freebsd.org
Subject:   Re: RFC: MK_BLOBS build option
Message-ID:  <20120128150126.GA14522@thorin>
In-Reply-To: <4F204FDD.60807@delphij.net>
References:  <20120122201814.GA32081@thorin> <4F1DBB94.900@delphij.net> <CAOfDtXME9PzmC2S8uqfYoPLb0%2BbbFKsBY5H3EWK3fpkGp7J8Ow@mail.gmail.com> <4F204FDD.60807@delphij.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--KFztAG8eRSV9hGtP
Content-Type: multipart/mixed; boundary="UlVJffcvxoiEqYs2"
Content-Disposition: inline


--UlVJffcvxoiEqYs2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Jan 25, 2012 at 10:54:21AM -0800, Xin Li wrote:
>=20
> I meant this, basically we have:
>=20
> GENERIC -- default kernel in FreeBSD
> SOURCELESS_EXCLUDES -- a meta-'overlay' that contains 'include
> SOURCELESS_HOST_EXCLUDES' and 'include SOURCELESS_UCODE_EXCLUDES'
> SOURCELESS_HOST_EXCLUDES -- a 'overlay' that contains a few 'nodevice
> <devname>'s
> SOURCELESS_UCODE_EXCLUDES -- ditto
>=20
> This way, e.g. GENERIC-DEBIAN would be simply:
>=20
> include GENERIC
> include SOURCELESS_EXCLUDES
>=20
> This way would minimize the maintenance of the GENERIC-DEBIAN I think
> while not compromising your policy of not including these stuff in binary?

Sounds fine to me.  Please let me know what you think about this.  I took y=
our
idea but used "WITHOUT" rather than "EXCLUDES" for consistency with the
MK_SOURCELESS_* options (which would be disabled using e.g.
-DWITHOUT_SOURCELESS_UCODE in command-line).

I've also rewritten descriptions of the MK_* options so they use the word
"sourceless" instead of referring to "binary-only blobs".

--=20
Robert Millan

--UlVJffcvxoiEqYs2
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="mk_sourceless.diff"
Content-Transfer-Encoding: quoted-printable

Index: sys/i386/conf/WITHOUT_SOURCELESS
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/i386/conf/WITHOUT_SOURCELESS	(revision 0)
+++ sys/i386/conf/WITHOUT_SOURCELESS	(revision 0)
@@ -0,0 +1,7 @@
+#
+# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
+#
+# $FreeBSD$
+
+include WITHOUT_SOURCELESS_HOST
+include WITHOUT_SOURCELESS_UCODE
Index: sys/i386/conf/WITHOUT_SOURCELESS_HOST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/i386/conf/WITHOUT_SOURCELESS_HOST	(revision 0)
+++ sys/i386/conf/WITHOUT_SOURCELESS_HOST	(revision 0)
@@ -0,0 +1,10 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# native code for host CPU.
+#
+# $FreeBSD$
+
+nodevice	hpt27xx
+nodevice	hptmv
+nodevice	hptrr
+nodevice	nve
Index: sys/i386/conf/WITHOUT_SOURCELESS_UCODE
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/i386/conf/WITHOUT_SOURCELESS_UCODE	(revision 0)
+++ sys/i386/conf/WITHOUT_SOURCELESS_UCODE	(revision 0)
@@ -0,0 +1,40 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# microcode.
+#
+# $FreeBSD$
+
+nodevice	bce
+nodevice	fatm
+nodevice	fxp
+nodevice	ispfw
+nodevice	mwlfw
+nodevice	ralfw
+nodevice	runfw
+nodevice	sf
+nodevice	sn
+nodevice	ti
+nodevice	txp
+nodevice	ce
+nodevice	cp
+nodevice	ctau
+nodevice	ipwfw
+nodevice	iwifw
+nodevice	iwnfw
+nodevice	wpifw
+
+# drm
+nodevice	mga
+nodevice	r128
+nodevice	radeon
+
+# sound
+nodevice	csa
+nodevice	ds1
+nodevice	maestro3
+
+# usb
+nodevice	rum
+nodevice	uath
+nodevice	zyd
+nodevice	kue
Index: sys/amd64/conf/WITHOUT_SOURCELESS
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/amd64/conf/WITHOUT_SOURCELESS	(revision 0)
+++ sys/amd64/conf/WITHOUT_SOURCELESS	(revision 0)
@@ -0,0 +1,7 @@
+#
+# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
+#
+# $FreeBSD$
+
+include WITHOUT_SOURCELESS_HOST
+include WITHOUT_SOURCELESS_UCODE
Index: sys/amd64/conf/WITHOUT_SOURCELESS_HOST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/amd64/conf/WITHOUT_SOURCELESS_HOST	(revision 0)
+++ sys/amd64/conf/WITHOUT_SOURCELESS_HOST	(revision 0)
@@ -0,0 +1,10 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# native code for host CPU.
+#
+# $FreeBSD$
+
+nodevice	hpt27xx
+nodevice	hptmv
+nodevice	hptrr
+nodevice	nve
Index: sys/amd64/conf/WITHOUT_SOURCELESS_UCODE
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/amd64/conf/WITHOUT_SOURCELESS_UCODE	(revision 0)
+++ sys/amd64/conf/WITHOUT_SOURCELESS_UCODE	(revision 0)
@@ -0,0 +1,40 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# microcode.
+#
+# $FreeBSD$
+
+nodevice	bce
+nodevice	fatm
+nodevice	fxp
+nodevice	ispfw
+nodevice	mwlfw
+nodevice	ralfw
+nodevice	runfw
+nodevice	sf
+nodevice	sn
+nodevice	ti
+nodevice	txp
+nodevice	ce
+nodevice	cp
+nodevice	ctau
+nodevice	ipwfw
+nodevice	iwifw
+nodevice	iwnfw
+nodevice	wpifw
+
+# drm
+nodevice	mga
+nodevice	r128
+nodevice	radeon
+
+# sound
+nodevice	csa
+nodevice	ds1
+nodevice	maestro3
+
+# usb
+nodevice	rum
+nodevice	uath
+nodevice	zyd
+nodevice	kue
Index: sys/modules/sound/driver/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/modules/sound/driver/Makefile	(revision 230389)
+++ sys/modules/sound/driver/Makefile	(working copy)
@@ -1,10 +1,21 @@
 # $FreeBSD$
=20
-SUBDIR=3D		ad1816 als4000 atiixp cs4281 csa ds1 emu10k1 emu10kx
-SUBDIR+=3D	envy24 envy24ht es137x ess fm801 hda ich maestro maestro3
+.include <bsd.own.mk>
+
+# Modules that include binary-only blobs of microcode should be selectable=
 by
+# MK_SOURCELESS_UCODE option (see below).
+
+SUBDIR=3D		ad1816 als4000 atiixp cs4281 ${_csa} ${_ds1} emu10k1 emu10kx
+SUBDIR+=3D	envy24 envy24ht es137x ess fm801 hda ich maestro ${_maestro3}
 SUBDIR+=3D	neomagic sb16 sb8 sbc solo spicds t4dwave via8233
 SUBDIR+=3D	via82c686 vibes driver uaudio
=20
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
+_csa=3D		csa
+_ds1=3D		ds1
+_maestro3=3D	maestro3
+.endif
+
 .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D "amd64"
 SUBDIR+=3D	cmi mss
 .endif
Index: sys/modules/drm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/modules/drm/Makefile	(revision 230389)
+++ sys/modules/drm/Makefile	(working copy)
@@ -1,15 +1,26 @@
 # $FreeBSD$
=20
+.include <bsd.own.mk>
+
+# Modules that include binary-only blobs of microcode should be selectable=
 by
+# MK_SOURCELESS_UCODE option (see below).
+
 SUBDIR =3D \
 	drm \
 	i915 \
 	mach64 \
-	mga \
-	r128 \
-	radeon \
+	${_mga} \
+	${_r128} \
+	${_radeon} \
 	savage \
 	sis \
 	tdfx \
 	via
=20
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
+_mga=3D		mga
+_r128=3D		r128
+_radeon=3D	radeon
+.endif
+
 .include <bsd.subdir.mk>
Index: sys/modules/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/modules/Makefile	(revision 230389)
+++ sys/modules/Makefile	(working copy)
@@ -2,6 +2,9 @@
=20
 .include <bsd.own.mk>
=20
+# Modules that include binary-only blobs of microcode should be selectable=
 by
+# MK_SOURCELESS_UCODE option (see below).
+
 SUBDIR=3D	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
@@ -36,7 +39,7 @@
 	ath \
 	ath_pci \
 	${_auxio} \
-	bce \
+	${_bce} \
 	bfe \
 	bge \
 	${_bxe} \
@@ -95,13 +98,13 @@
 	${_ex} \
 	${_exca} \
 	${_ext2fs} \
-	fatm \
+	${_fatm} \
 	fdc \
 	fdescfs \
 	${_fe} \
 	firewire \
 	firmware \
-	fxp \
+	${_fxp} \
 	gem \
 	geom \
 	${_glxiic} \
@@ -147,7 +150,7 @@
 	${_ipwfw} \
 	iscsi \
 	isp \
-	ispfw \
+	${_ispfw} \
 	${_iwi} \
 	${_iwifw} \
 	${_iwn} \
@@ -208,7 +211,7 @@
 	${_mthca} \
 	mvs \
 	mwl \
-	mwlfw \
+	${_mwlfw} \
 	mxge \
 	my \
 	${_ncp} \
@@ -258,14 +261,14 @@
 	puc \
 	${_qlxgb} \
 	ral \
-	ralfw \
+	${_ralfw} \
 	${_random} \
 	rc4 \
 	${_rdma} \
 	re \
 	reiserfs \
 	rl \
-	runfw \
+	${_runfw} \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
@@ -275,7 +278,7 @@
 	sdhci \
 	sem \
 	send \
-	sf \
+	${_sf} \
 	${_sfxge} \
 	sge \
 	siba_bwn \
@@ -284,7 +287,7 @@
 	sis \
 	sk \
 	${_smbfs} \
-	sn \
+	${_sn} \
 	${_snc} \
 	snp \
 	${_sound} \
@@ -299,7 +302,7 @@
 	${_sym} \
 	${_syscons} \
 	sysvipc \
-	ti \
+	${_ti} \
 	tl \
 	tmpfs \
 	${_tpm} \
@@ -308,7 +311,7 @@
 	twe \
 	tws \
 	tx \
-	txp \
+	${_txp} \
 	uart \
 	ubsec \
 	udf \
@@ -357,8 +360,10 @@
 # No barrier instruction support (specific to this driver)
 _sym=3D		sym
 # intr_disable() is a macro, causes problems
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _cxgb=3D		cxgb
 .endif
+.endif
=20
 .if ${MK_CRYPT} !=3D "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../opencrypto)
@@ -400,6 +405,20 @@
 .endif
 .endif
=20
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
+_bce=3D		bce
+_fatm=3D		fatm
+_fxp=3D		fxp
+_ispfw=3D		ispfw
+_mwlfw=3D		mwlfw
+_ralfw=3D		ralfw
+_runfw=3D		runfw
+_sf=3D		sf
+_sn=3D		sn
+_ti=3D		ti
+_txp=3D		txp
+.endif
+
 .if ${MACHINE_CPUARCH} =3D=3D "i386"
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.
@@ -415,9 +434,13 @@
 _bxe=3D		bxe
 _cardbus=3D	cardbus
 _cbb=3D		cbb
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _ce=3D		ce
+.endif
 _coff=3D		coff
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _cp=3D		cp
+.endif
 _cpuctl=3D	cpuctl
 _cpufreq=3D	cpufreq
 _cs=3D		cs
@@ -506,35 +529,51 @@
 _cm=3D		cm
 _cmx=3D		cmx
 _coretemp=3D	coretemp
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _ctau=3D		ctau
+.endif
 _dpt=3D		dpt
 _ex=3D		ex
+.if ${MK_SOURCELESS_HOST} !=3D "no"
 _hpt27xx=3D	hpt27xx
+.endif
 _hptiop=3D	hptiop
+.if ${MK_SOURCELESS_HOST} !=3D "no"
 _hptmv=3D		hptmv
 _hptrr=3D		hptrr
+.endif
 _ichwd=3D		ichwd
 _ida=3D		ida
 _iir=3D		iir
 _ipmi=3D		ipmi
 _ips=3D		ips
 _ipw=3D		ipw
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _ipwfw=3D		ipwfw
+.endif
 _iwi=3D		iwi
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _iwifw=3D		iwifw
+.endif
 _iwn=3D		iwn
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _iwnfw=3D		iwnfw
+.endif
 _ixgb=3D		ixgb
 _ixgbe=3D		ixgbe
 _mly=3D		mly
 _nfe=3D		nfe
+.if ${MK_SOURCELESS_HOST} !=3D "no"
 _nve=3D		nve
+.endif
 _nvram=3D		nvram
 _nxge=3D		nxge
 _tpm=3D		tpm
 _viawd=3D		viawd
 _wpi=3D		wpi
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _wpifw=3D		wpifw
+.endif
 .if ${MK_CRYPT} !=3D "no" || defined(ALL_MODULES)
 _padlock=3D	padlock
 .endif
@@ -586,10 +625,14 @@
 _em=3D		em
 _exca=3D		exca
 _ext2fs=3D	ext2fs
+.if ${MK_SOURCELESS_HOST} !=3D "no"
 _hpt27xx=3D	hpt27xx
+.endif
 _hptiop=3D	hptiop
+.if ${MK_SOURCELESS_HOST} !=3D "no"
 _hptmv=3D		hptmv
 _hptrr=3D		hptrr
+.endif
 _i2c=3D		i2c
 _ichwd=3D		ichwd
 _ida=3D		ida
@@ -600,11 +643,17 @@
 _ipmi=3D		ipmi
 _ips=3D		ips
 _ipw=3D		ipw
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _ipwfw=3D		ipwfw
+.endif
 _iwi=3D		iwi
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _iwifw=3D		iwifw
+.endif
 _iwn=3D		iwn
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _iwnfw=3D		iwnfw
+.endif
 _ixgb=3D		ixgb
 _ixgbe=3D		ixgbe
 _lindev=3D	lindev
@@ -620,7 +669,9 @@
 .endif
 _ndis=3D		ndis
 _nfe=3D		nfe
+.if ${MK_SOURCELESS_HOST} !=3D "no"
 _nve=3D		nve
+.endif
 _nvram=3D		nvram
 _nxge=3D		nxge
 .if ${MK_CDDL} !=3D "no" || defined(ALL_MODULES)
@@ -650,7 +701,9 @@
 _x86bios=3D	x86bios
 _wi=3D		wi
 _wpi=3D		wpi
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
 _wpifw=3D		wpifw
+.endif
 .if ${MK_ZFS} !=3D "no" || defined(ALL_MODULES)
 _zfs=3D		zfs
 .endif
Index: sys/modules/usb/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/modules/usb/Makefile	(revision 230389)
+++ sys/modules/usb/Makefile	(working copy)
@@ -25,16 +25,28 @@
 # SUCH DAMAGE.
 #
=20
+.include <bsd.own.mk>
+
+# Modules that include binary-only blobs of microcode should be selectable=
 by
+# MK_SOURCELESS_UCODE option (see below).
+
 SUBDIR =3D usb
 SUBDIR +=3D ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} $=
{_avr32dci}
-SUBDIR +=3D rum run uath upgt usie ural zyd ${_urtw}
+SUBDIR +=3D ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw}
 SUBDIR +=3D atp uhid ukbd ums udbp ufm uep
 SUBDIR +=3D ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipa=
q ulpt \
 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
-SUBDIR +=3D uether aue axe cdce cue kue mos rue udav uhso ipheth
+SUBDIR +=3D uether aue axe cdce cue ${_kue} mos rue udav uhso ipheth
 SUBDIR +=3D usfs umass urio
 SUBDIR +=3D quirk template
=20
+.if ${MK_SOURCELESS_UCODE} !=3D "no"
+_rum=3D		rum
+_uath=3D		uath
+_zyd=3D		zyd
+_kue=3D		kue
+.endif
+
 .if ${MACHINE_CPUARCH} =3D=3D "amd64"
 _urtw=3D		urtw
 .endif
Index: share/mk/bsd.own.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- share/mk/bsd.own.mk	(revision 230389)
+++ share/mk/bsd.own.mk	(working copy)
@@ -320,6 +320,9 @@
     BOOT \
     BSD_CPIO \
     BSNMP \
+    SOURCELESS \
+    SOURCELESS_HOST \
+    SOURCELESS_UCODE \
     BZIP2 \
     CALENDAR \
     CAPSICUM \
@@ -511,6 +514,11 @@
 MK_BIND_ETC:=3D	no
 .endif
=20
+.if ${MK_SOURCELESS} =3D=3D "no"
+MK_SOURCELESS_HOST:=3D	no
+MK_SOURCELESS_UCODE:=3D no
+.endif
+
 .if ${MK_CDDL} =3D=3D "no"
 MK_ZFS:=3D	no
 MK_CTF:=3D	no
Index: tools/build/options/WITHOUT_SOURCELESS
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tools/build/options/WITHOUT_SOURCELESS	(revision 0)
+++ tools/build/options/WITHOUT_SOURCELESS	(revision 0)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build kernel modules that include sourceless code (either micro=
code or native code for host CPU).
Index: tools/build/options/WITHOUT_SOURCELESS_HOST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tools/build/options/WITHOUT_SOURCELESS_HOST	(revision 0)
+++ tools/build/options/WITHOUT_SOURCELESS_HOST	(revision 0)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build kernel modules that include sourceless native code for ho=
st CPU.
Index: tools/build/options/WITHOUT_SOURCELESS_UCODE
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tools/build/options/WITHOUT_SOURCELESS_UCODE	(revision 0)
+++ tools/build/options/WITHOUT_SOURCELESS_UCODE	(revision 0)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build kernel modules that include sourceless microcode.

--UlVJffcvxoiEqYs2--

--KFztAG8eRSV9hGtP
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/kFreeBSD)

iQIcBAEBCAAGBQJPJA3EAAoJELd1onhloKnO4J8P/At3Ybi1aG4ijodSnarslhVd
uxTSLaLBQ22hcGrBDFtwfxlz8jAvm4/httIzDQIP53fFRh2UAyA43eCx3uzv8C7A
IcfHdr9RgPcaM0WWDoUDFV6Ym+1InnKeH9Ko5fZsKp7KBbs0BwjkklJ7a6WWs1Ut
/OKQ2qDGSAlyoCUuXI6lqe4yFAIueciGsfJenv55+oF68leMnjXP9DiZC72J8Rw1
AWMIz4Vn1brPbh2s3PDokrBc4zlWpRP6Qa0W0mJ4D2veiO5b4pQgc6adAC0/qAsF
/mhLQTJbMjIq52LTUrXrnf6a85Av8VIIZXFUG5gSHkgkYgo3O8kf/97ebDwfgufu
6ao6/zXupN84M/9doh+WXvhUPdsoHE3Jnu6EkGVwlIDRqGnXmHAzHqZxntkkpl/o
S1uLnJgVGiR8sb5Wp7XRsEzjgmcN39UiV1cZUXGn2XlJR5d/5YtfHd8ynuDawq9t
sZFA5/2F+944Xj81MTi8IVBVGOd9B6pntvqA7LdMVhH9pVsZCDSRSLZxAVZ/koL8
pGZNufA1dbbKPwnhuJXublF4jOA37HxwyR9slpZypw1a4ugYHapLQRznLiAy10nd
QWdBUNX4ijUcCmIuXC7svHs967PR1DKvXLxjnlcAIh0P/+ar8lqcPcSVHsbKZMBk
8uMNO8msCh2Qlkx8PoF2
=3K2L
-----END PGP SIGNATURE-----

--KFztAG8eRSV9hGtP--



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