d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the /usr/share/doc/legal files to driver.LICENSE to work around

Browse Source 
bug of installing 'realtek' and 'intel_iwn' as files rather then as
a 'LICENSE' file in their directories.

Also add obsolete entries for the older names and names that existed in head
for a period of time.

Suggested by:	jmg
X-MFC-With:	r289391
MFC after:	3 weeks
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
bdrewery 2015-10-16 00:38:05 +00:00
parent 7eb387b320
commit e1f3daf5e3
16 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ObsoleteFiles.inc
View File

@ -38,6 +38,19 @@
# xargs -n1 | sort | uniq -d; # xargs -n1 | sort | uniq -d;
# done # done
# 20151015: Rename files due to file-installed-as-dir bug
OLD_FILES+=usr/share/doc/legal/realtek
OLD_FILES+=usr/share/doc/legal/realtek/LICENSE
OLD_DIRS+=usr/share/doc/legal/realtek
OLD_DIRS+=usr/share/doc/legal/intel_ipw
OLD_FILES+=usr/share/doc/legal/intel_ipw/LICENSE
OLD_FILES+=usr/share/doc/legal/intel_iwn
OLD_FILES+=usr/share/doc/legal/intel_iwn/LICENSE
OLD_DIRS+=usr/share/doc/legal/intel_iwn
OLD_DIRS+=usr/share/doc/legal/intel_iwi
OLD_FILES+=usr/share/doc/legal/intel_iwi/LICENSE
OLD_DIRS+=usr/share/doc/legal/intel_wpi
OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE
# 20151006: new libc++ import # 20151006: new libc++ import
OLD_FILES+=usr/include/c++/__tuple_03 OLD_FILES+=usr/include/c++/__tuple_03
# 20151006: new clang import which bumps version from 3.6.1 to 3.7.0. # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0.

10
etc/mtree/BSD.usr.dist
View File

@ -190,16 +190,6 @@
atm atm
.. ..
legal legal
intel_ipw
..
intel_iwi
..
intel_iwn
..
intel_wpi
..
realtek
..
.. ..
llvm llvm
clang clang

3
share/doc/legal/intel_ipw/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
FILES= ${.CURDIR}/../../../../sys/contrib/dev/ipw/LICENSE FILES= ${.CURDIR}/../../../../sys/contrib/dev/ipw/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal/intel_ipw FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_ipw.LICENSE
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
share/doc/legal/intel_iwi/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwi/LICENSE FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwi/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal/intel_iwi FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwi.LICENSE
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
share/doc/legal/intel_iwn/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal/intel_iwn FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwn.LICENSE
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
share/doc/legal/intel_wpi/Makefile
View File

@ -1,7 +1,8 @@
# $FreeBSD$ # $FreeBSD$
FILES= ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE FILES= ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal/intel_wpi FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_wpi.LICENSE
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
share/doc/legal/realtek/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
FILES= ${.CURDIR}/../../../../sys/contrib/dev/urtwn/LICENSE FILES= ${.CURDIR}/../../../../sys/contrib/dev/urtwn/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal/realtek FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= realtek.LICENSE
.include <bsd.prog.mk> .include <bsd.prog.mk>

8
share/man/man4/ipw.4
View File

@ -25,7 +25,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd April 13, 2008 .Dd October 15, 2015
.Dt IPW 4 .Dt IPW 4
.Os .Os
.Sh NAME .Sh NAME
@ -77,14 +77,14 @@ This driver requires the firmware built with the
.Nm ipwfw .Nm ipwfw
module to work. module to work.
For the loaded firmware to be enabled for use the license at For the loaded firmware to be enabled for use the license at
.Pa /usr/share/doc/legal/intel_ipw/LICENSE .Pa /usr/share/doc/legal/intel_ipw.LICENSE
must be agreed by adding the following line to must be agreed by adding the following line to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Pp .Pp
.Dl "legal.intel_ipw.license_ack=1" .Dl "legal.intel_ipw.license_ack=1"
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw/LICENSE" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw.LICENSE" -compact
.It Pa /usr/share/doc/legal/intel_ipw/LICENSE .It Pa /usr/share/doc/legal/intel_ipw.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

8
share/man/man4/ipwfw.4
View File

@ -22,7 +22,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd January 14, 2010 .Dd October 15, 2015
.Dt IPWFW 4 .Dt IPWFW 4
.Os .Os
.Sh NAME .Sh NAME
@ -59,14 +59,14 @@ Intel PRO/Wireless 2100 series of IEEE 802.11 adapters.
It may be statically linked into the kernel, or loaded as a module. It may be statically linked into the kernel, or loaded as a module.
.Pp .Pp
For the loaded firmware to be enabled for use the license at For the loaded firmware to be enabled for use the license at
.Pa /usr/share/doc/legal/intel_ipw/LICENSE .Pa /usr/share/doc/legal/intel_ipw.LICENSE
must be agreed to by adding the following line to must be agreed to by adding the following line to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Pp .Pp
.Dl "legal.intel_ipw.license_ack=1" .Dl "legal.intel_ipw.license_ack=1"
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw/LICENSE" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw.LICENSE" -compact
.It Pa /usr/share/doc/legal/intel_ipw/LICENSE .It Pa /usr/share/doc/legal/intel_ipw.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

8
share/man/man4/iwi.4
View File

@ -25,7 +25,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd April 13, 2008 .Dd October 15, 2015
.Dt IWI 4 .Dt IWI 4
.Os .Os
.Sh NAME .Sh NAME
@ -77,14 +77,14 @@ This driver requires the firmware built with the
.Nm iwifw .Nm iwifw
module to work. module to work.
For the loaded firmware to be enabled for use the license at For the loaded firmware to be enabled for use the license at
.Pa /usr/share/doc/legal/intel_iwi/LICENSE .Pa /usr/share/doc/legal/intel_iwi.LICENSE
must be agreed by adding the following line to must be agreed by adding the following line to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Pp .Pp
.Dl "legal.intel_iwi.license_ack=1" .Dl "legal.intel_iwi.license_ack=1"
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi/LICENSE" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi.LICENSE" -compact
.It Pa /usr/share/doc/legal/intel_iwi/LICENSE .It Pa /usr/share/doc/legal/intel_iwi.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

8
share/man/man4/iwifw.4
View File

@ -22,7 +22,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd January 14, 2010 .Dd October 15, 2015
.Dt IWIFW 4 .Dt IWIFW 4
.Os .Os
.Sh NAME .Sh NAME
@ -59,14 +59,14 @@ Intel PRO/Wireless 2200BG/2225BG/2915ABG series of IEEE 802.11 adapters.
It may be statically linked into the kernel, or loaded as a module. It may be statically linked into the kernel, or loaded as a module.
.Pp .Pp
For the loaded firmware to be enabled for use the license at For the loaded firmware to be enabled for use the license at
.Pa /usr/share/doc/legal/intel_iwi/LICENSE .Pa /usr/share/doc/legal/intel_iwi.LICENSE
must be agreed to by adding the following line to must be agreed to by adding the following line to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Pp .Pp
.Dl "legal.intel_iwi.license_ack=1" .Dl "legal.intel_iwi.license_ack=1"
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi/LICENSE" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi.LICENSE" -compact
.It Pa /usr/share/doc/legal/intel_iwi/LICENSE .It Pa /usr/share/doc/legal/intel_iwi.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

4
share/man/man4/rsu.4
View File

@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd October 13, 2015 .Dd October 15, 2015
.Dt RSU 4 .Dt RSU 4
.Os .Os
.Sh NAME .Sh NAME
@ -41,7 +41,7 @@ if_rsu_load="YES"
.Ed .Ed
.Pp .Pp
After you have read the license in After you have read the license in
.Pa /usr/share/doc/legal/realtek .Pa /usr/share/doc/legal/realtek.LICENSE
you will want to add the following lines to you will want to add the following lines to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Bd -literal -offset indent .Bd -literal -offset indent

8
share/man/man4/urtwn.4
View File

@ -14,7 +14,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 24, 2014 .Dd October 15, 2015
.Dt URTWN 4 .Dt URTWN 4
.Os .Os
.Sh NAME .Sh NAME
@ -68,14 +68,14 @@ This driver requires the firmware built with the
.Nm urtwnfw .Nm urtwnfw
module to work. module to work.
For the loaded firmware to be enabled for use the license at For the loaded firmware to be enabled for use the license at
.Pa /usr/share/doc/legal/realtek .Pa /usr/share/doc/legal/realtek.LICENSE
must be agreed by adding the following line to must be agreed by adding the following line to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Pp .Pp
.Dl "legal.realtek.license_ack=1" .Dl "legal.realtek.license_ack=1"
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/realtek.LICENSE" -compact
.It Pa /usr/share/doc/legal/realtek .It Pa /usr/share/doc/legal/realtek.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

8
share/man/man4/urtwnfw.4
View File

@ -22,7 +22,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd April 25, 2014 .Dd October 15, 2015
.Dt URTWNFW 4 .Dt URTWNFW 4
.Os .Os
.Sh NAME .Sh NAME
@ -61,14 +61,14 @@ It may be
statically linked into the kernel, or loaded as a module. statically linked into the kernel, or loaded as a module.
.Pp .Pp
For the loaded firmware to be enabled for use the license at For the loaded firmware to be enabled for use the license at
.Pa /usr/share/doc/legal/realtek .Pa /usr/share/doc/legal/realtek.LICENSE
must be agreed to by adding the following line to must be agreed to by adding the following line to
.Xr loader.conf 5 : .Xr loader.conf 5 :
.Pp .Pp
.Dl "legal.realtek.license_ack=1" .Dl "legal.realtek.license_ack=1"
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/realtek.LICENSE" -compact
.It Pa /usr/share/doc/legal/realtek .It Pa /usr/share/doc/legal/realtek.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

6
share/man/man4/wpi.4
View File

@ -26,7 +26,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 5, 2008 .Dd October 15, 2015
.Dt WPI 4 .Dt WPI 4
.Os .Os
.Sh NAME .Sh NAME
@ -72,8 +72,8 @@ This driver requires the firmware built with the
.Nm wpifw .Nm wpifw
module to work. module to work.
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /usr/share/doc/legal/intel_wpi/LICENSE" -compact .Bl -tag -width ".Pa /usr/share/doc/legal/intel_wpi.LICENSE" -compact
.It Pa /usr/share/doc/legal/intel_wpi/LICENSE .It Pa /usr/share/doc/legal/intel_wpi.LICENSE
.Nm .Nm
firmware license firmware license
.El .El

2
sys/tools/fw_stub.awk
View File

@ -156,7 +156,7 @@ if (opt_l) {
printc("\ printc("\
TUNABLE_LONG_FETCH(\"legal." opt_l ".license_ack\", &" opt_l "_license_ack);\ TUNABLE_LONG_FETCH(\"legal." opt_l ".license_ack\", &" opt_l "_license_ack);\
if (!" opt_l "_license_ack) {\ if (!" opt_l "_license_ack) {\
printf(\"" opt_m ": You need to read the LICENSE file in /usr/share/doc/legal/" opt_l "/.\\n\");\ printf(\"" opt_m ": You need to read the LICENSE file in /usr/share/doc/legal/" opt_l ".LICENSE.\\n\");\
printf(\"" opt_m ": If you agree with the license, set legal." opt_l ".license_ack=1 in /boot/loader.conf.\\n\");\ printf(\"" opt_m ": If you agree with the license, set legal." opt_l ".license_ack=1 in /boot/loader.conf.\\n\");\
return(EPERM);\ return(EPERM);\
}\n"); }\n");