svn commit: r289399 - in head: . etc/mtree share/doc/legal/intel_ipw share/doc/legal/intel_iwi share/doc/legal/intel_iwn share/doc/legal/intel_wpi share/doc/legal/realtek share/man/man4 sys/tools
Bryan Drewery
bdrewery at FreeBSD.org
Fri Oct 16 00:38:08 UTC 2015
Author: bdrewery
Date: Fri Oct 16 00:38:05 2015
New Revision: 289399
URL: https://svnweb.freebsd.org/changeset/base/289399
Log:
Rename the /usr/share/doc/legal files to driver.LICENSE to work around
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
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.usr.dist
head/share/doc/legal/intel_ipw/Makefile
head/share/doc/legal/intel_iwi/Makefile
head/share/doc/legal/intel_iwn/Makefile
head/share/doc/legal/intel_wpi/Makefile
head/share/doc/legal/realtek/Makefile
head/share/man/man4/ipw.4
head/share/man/man4/ipwfw.4
head/share/man/man4/iwi.4
head/share/man/man4/iwifw.4
head/share/man/man4/rsu.4
head/share/man/man4/urtwn.4
head/share/man/man4/urtwnfw.4
head/share/man/man4/wpi.4
head/sys/tools/fw_stub.awk
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Thu Oct 15 23:49:05 2015 (r289398)
+++ head/ObsoleteFiles.inc Fri Oct 16 00:38:05 2015 (r289399)
@@ -38,6 +38,19 @@
# xargs -n1 | sort | uniq -d;
# 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
OLD_FILES+=usr/include/c++/__tuple_03
# 20151006: new clang import which bumps version from 3.6.1 to 3.7.0.
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Thu Oct 15 23:49:05 2015 (r289398)
+++ head/etc/mtree/BSD.usr.dist Fri Oct 16 00:38:05 2015 (r289399)
@@ -190,16 +190,6 @@
atm
..
legal
- intel_ipw
- ..
- intel_iwi
- ..
- intel_iwn
- ..
- intel_wpi
- ..
- realtek
- ..
..
llvm
clang
Modified: head/share/doc/legal/intel_ipw/Makefile
==============================================================================
--- head/share/doc/legal/intel_ipw/Makefile Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/doc/legal/intel_ipw/Makefile Fri Oct 16 00:38:05 2015 (r289399)
@@ -1,6 +1,7 @@
# $FreeBSD$
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>
Modified: head/share/doc/legal/intel_iwi/Makefile
==============================================================================
--- head/share/doc/legal/intel_iwi/Makefile Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/doc/legal/intel_iwi/Makefile Fri Oct 16 00:38:05 2015 (r289399)
@@ -1,6 +1,7 @@
# $FreeBSD$
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>
Modified: head/share/doc/legal/intel_iwn/Makefile
==============================================================================
--- head/share/doc/legal/intel_iwn/Makefile Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/doc/legal/intel_iwn/Makefile Fri Oct 16 00:38:05 2015 (r289399)
@@ -1,6 +1,7 @@
# $FreeBSD$
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>
Modified: head/share/doc/legal/intel_wpi/Makefile
==============================================================================
--- head/share/doc/legal/intel_wpi/Makefile Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/doc/legal/intel_wpi/Makefile Fri Oct 16 00:38:05 2015 (r289399)
@@ -1,7 +1,8 @@
# $FreeBSD$
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>
Modified: head/share/doc/legal/realtek/Makefile
==============================================================================
--- head/share/doc/legal/realtek/Makefile Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/doc/legal/realtek/Makefile Fri Oct 16 00:38:05 2015 (r289399)
@@ -1,6 +1,7 @@
# $FreeBSD$
FILES= ${.CURDIR}/../../../../sys/contrib/dev/urtwn/LICENSE
-FILESDIR= ${SHAREDIR}/doc/legal/realtek
+FILESDIR= ${SHAREDIR}/doc/legal
+FILESNAME= realtek.LICENSE
.include <bsd.prog.mk>
Modified: head/share/man/man4/ipw.4
==============================================================================
--- head/share/man/man4/ipw.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/ipw.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 13, 2008
+.Dd October 15, 2015
.Dt IPW 4
.Os
.Sh NAME
@@ -77,14 +77,14 @@ This driver requires the firmware built
.Nm ipwfw
module to work.
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
.Xr loader.conf 5 :
.Pp
.Dl "legal.intel_ipw.license_ack=1"
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw/LICENSE" -compact
-.It Pa /usr/share/doc/legal/intel_ipw/LICENSE
+.Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw.LICENSE" -compact
+.It Pa /usr/share/doc/legal/intel_ipw.LICENSE
.Nm
firmware license
.El
Modified: head/share/man/man4/ipwfw.4
==============================================================================
--- head/share/man/man4/ipwfw.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/ipwfw.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 14, 2010
+.Dd October 15, 2015
.Dt IPWFW 4
.Os
.Sh NAME
@@ -59,14 +59,14 @@ Intel PRO/Wireless 2100 series of IEEE 8
It may be statically linked into the kernel, or loaded as a module.
.Pp
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
.Xr loader.conf 5 :
.Pp
.Dl "legal.intel_ipw.license_ack=1"
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw/LICENSE" -compact
-.It Pa /usr/share/doc/legal/intel_ipw/LICENSE
+.Bl -tag -width ".Pa /usr/share/doc/legal/intel_ipw.LICENSE" -compact
+.It Pa /usr/share/doc/legal/intel_ipw.LICENSE
.Nm
firmware license
.El
Modified: head/share/man/man4/iwi.4
==============================================================================
--- head/share/man/man4/iwi.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/iwi.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 13, 2008
+.Dd October 15, 2015
.Dt IWI 4
.Os
.Sh NAME
@@ -77,14 +77,14 @@ This driver requires the firmware built
.Nm iwifw
module to work.
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
.Xr loader.conf 5 :
.Pp
.Dl "legal.intel_iwi.license_ack=1"
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi/LICENSE" -compact
-.It Pa /usr/share/doc/legal/intel_iwi/LICENSE
+.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi.LICENSE" -compact
+.It Pa /usr/share/doc/legal/intel_iwi.LICENSE
.Nm
firmware license
.El
Modified: head/share/man/man4/iwifw.4
==============================================================================
--- head/share/man/man4/iwifw.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/iwifw.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 14, 2010
+.Dd October 15, 2015
.Dt IWIFW 4
.Os
.Sh NAME
@@ -59,14 +59,14 @@ Intel PRO/Wireless 2200BG/2225BG/2915ABG
It may be statically linked into the kernel, or loaded as a module.
.Pp
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
.Xr loader.conf 5 :
.Pp
.Dl "legal.intel_iwi.license_ack=1"
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi/LICENSE" -compact
-.It Pa /usr/share/doc/legal/intel_iwi/LICENSE
+.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwi.LICENSE" -compact
+.It Pa /usr/share/doc/legal/intel_iwi.LICENSE
.Nm
firmware license
.El
Modified: head/share/man/man4/rsu.4
==============================================================================
--- head/share/man/man4/rsu.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/rsu.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd October 13, 2015
+.Dd October 15, 2015
.Dt RSU 4
.Os
.Sh NAME
@@ -41,7 +41,7 @@ if_rsu_load="YES"
.Ed
.Pp
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
.Xr loader.conf 5 :
.Bd -literal -offset indent
Modified: head/share/man/man4/urtwn.4
==============================================================================
--- head/share/man/man4/urtwn.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/urtwn.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -14,7 +14,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 24, 2014
+.Dd October 15, 2015
.Dt URTWN 4
.Os
.Sh NAME
@@ -68,14 +68,14 @@ This driver requires the firmware built
.Nm urtwnfw
module to work.
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
.Xr loader.conf 5 :
.Pp
.Dl "legal.realtek.license_ack=1"
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact
-.It Pa /usr/share/doc/legal/realtek
+.Bl -tag -width ".Pa /usr/share/doc/legal/realtek.LICENSE" -compact
+.It Pa /usr/share/doc/legal/realtek.LICENSE
.Nm
firmware license
.El
Modified: head/share/man/man4/urtwnfw.4
==============================================================================
--- head/share/man/man4/urtwnfw.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/urtwnfw.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 25, 2014
+.Dd October 15, 2015
.Dt URTWNFW 4
.Os
.Sh NAME
@@ -61,14 +61,14 @@ It may be
statically linked into the kernel, or loaded as a module.
.Pp
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
.Xr loader.conf 5 :
.Pp
.Dl "legal.realtek.license_ack=1"
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact
-.It Pa /usr/share/doc/legal/realtek
+.Bl -tag -width ".Pa /usr/share/doc/legal/realtek.LICENSE" -compact
+.It Pa /usr/share/doc/legal/realtek.LICENSE
.Nm
firmware license
.El
Modified: head/share/man/man4/wpi.4
==============================================================================
--- head/share/man/man4/wpi.4 Thu Oct 15 23:49:05 2015 (r289398)
+++ head/share/man/man4/wpi.4 Fri Oct 16 00:38:05 2015 (r289399)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 5, 2008
+.Dd October 15, 2015
.Dt WPI 4
.Os
.Sh NAME
@@ -72,8 +72,8 @@ This driver requires the firmware built
.Nm wpifw
module to work.
.Sh FILES
-.Bl -tag -width ".Pa /usr/share/doc/legal/intel_wpi/LICENSE" -compact
-.It Pa /usr/share/doc/legal/intel_wpi/LICENSE
+.Bl -tag -width ".Pa /usr/share/doc/legal/intel_wpi.LICENSE" -compact
+.It Pa /usr/share/doc/legal/intel_wpi.LICENSE
.Nm
firmware license
.El
Modified: head/sys/tools/fw_stub.awk
==============================================================================
--- head/sys/tools/fw_stub.awk Thu Oct 15 23:49:05 2015 (r289398)
+++ head/sys/tools/fw_stub.awk Fri Oct 16 00:38:05 2015 (r289399)
@@ -156,7 +156,7 @@ if (opt_l) {
printc("\
TUNABLE_LONG_FETCH(\"legal." opt_l ".license_ack\", &" 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\");\
return(EPERM);\
}\n");
More information about the svn-src-head
mailing list