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

Merge ^/head r325842 through r325998.

Browse Source
This commit is contained in:
Hans Petter Selasky 2017-11-19 12:36:03 +00:00
commit 937d37fc6c
1161 changed files with 16865 additions and 30718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -129,7 +129,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
everything hier hierarchy install installcheck installkernel \
installkernel.debug packagekernel packageworld \
reinstallkernel reinstallkernel.debug \
installworld kernel-toolchain libraries lint maninstall \
installworld kernel-toolchain libraries maninstall \
obj objlink showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _build-metadata _cross-tools _includes _libraries \
@ -167,18 +167,6 @@ META_TGT_WHITELIST+= \
tinderbox toolchain \
toolchains universe world worlds xdev xdev-build
# Likewise for AUTO_OBJ. Many targets do not need object directories created
# for each visited directory. Only when things are being built are they
# needed. Having AUTO_OBJ disabled in a build target is fine as it should
# fallback to running 'make obj' as needed. If a target is not in this list
# then it is ran with MK_AUTO_OBJ=no in environment.
# 'showconfig' is in the list to avoid forcing MK_AUTO_OBJ=no for it.
AUTO_OBJ_TGT_WHITELIST+= \
_* all all-man build* depend everything *toolchain* includes \
libraries obj objlink showconfig tags xdev xdev-build native-xtools \
stage* create-packages* real-packages sign-packages package-pkg \
tinderbox universe* kernel kernels world worlds bmake
.ORDER: buildworld installworld
.ORDER: buildworld distrib-dirs
.ORDER: buildworld distribution
@ -245,7 +233,7 @@ SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
.endif
_MAKE= PATH=${PATH} MAKE_CMD="${MAKE}" ${SUB_MAKE} -f Makefile.inc1 \
TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} ${_MAKEARGS}
.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
# Only allow meta mode for the whitelisted targets. See META_TGT_WHITELIST
@ -276,21 +264,6 @@ MK_META_MODE= no
.endif # ${MK_META_MODE} == yes
.endif # defined(MK_META_MODE) && ${MK_META_MODE} == yes
# Only allow AUTO_OBJ for the whitelisted targets. See AUTO_OBJ_TGT_WHITELIST
# above. MK_AUTO_OBJ not checked here for "yes" as it may not yet be enabled
# since it is opportunistic.
.if empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
.for _tgt in ${AUTO_OBJ_TGT_WHITELIST}
.if make(${_tgt})
_CAN_USE_AUTO_OBJ?= yes
.endif
.endfor
.if !defined(_CAN_USE_AUTO_OBJ)
_MAKE+= MK_AUTO_OBJ=no
MK_AUTO_OBJ= no
.endif
.endif # empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
# Guess target architecture from target type, and vice versa, based on
# historic FreeBSD practice of tending to have TARGET == TARGET_ARCH
# expanding to TARGET == TARGET_CPUARCH in recent times, with known

20
Makefile.inc1
View File

@ -1442,7 +1442,7 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${INSTALLKERNEL}"
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \
${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
.endif
@ -1451,7 +1451,7 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${_kernel}"
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
${_+_}cd ${KRNLOBJDIR}/${_kernel}; \
${CROSSENV} PATH=${TMPPATH} \
${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//}
.endfor
@ -1467,7 +1467,7 @@ distributekernel distributekernel.debug: .PHONY
.if defined(NO_ROOT)
@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
.endif
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
DESTDIR=${INSTALL_DDIR}/kernel \
@ -1482,7 +1482,7 @@ distributekernel distributekernel.debug: .PHONY
.if defined(NO_ROOT)
@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
.endif
cd ${KRNLOBJDIR}/${_kernel}; \
${_+_}cd ${KRNLOBJDIR}/${_kernel}; \
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
KERNEL=${INSTKERNNAME}.${_kernel} \
@ -1613,8 +1613,8 @@ create-packages: .PHONY create-packages-world create-packages-kernel
create-world-packages: _pkgbootstrap .PHONY
@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
@cd ${WSTAGEDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
${WSTAGEDIR}/METALOG
env -i LC_COLLATE=C sort ${WSTAGEDIR}/METALOG | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk
@for plist in ${WSTAGEDIR}/*.plist; do \
plist=$${plist##*/} ; \
pkgname=$${plist%.plist} ; \
@ -1658,9 +1658,9 @@ _debug=-debug
create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}
create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY
@cd ${KSTAGEDIR}/${DISTDIR} ; \
env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.meta | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${INSTALLKERNEL} \
${KSTAGEDIR}/kernel.meta ; \
-v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \
cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
sed -e "s/%VERSION%/${PKG_VERSION}/" \
@ -1693,9 +1693,9 @@ _debug=-debug
create-kernel-packages: create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}
create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}: _pkgbootstrap .PHONY
@cd ${KSTAGEDIR}/kernel.${_kernel} ; \
env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.${_kernel}.meta | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${_kernel} \
${KSTAGEDIR}/kernel.${_kernel}.meta ; \
-v kernel=yes -v _kernconf=${_kernel} ; \
cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
sed -e "s/%VERSION%/${PKG_VERSION}/" \

44
Makefile.sys.inc Normal file
View File

@ -0,0 +1,44 @@
# $FreeBSD$
#
# This is included very early from share/mk/src.sys.env.mk, after
# /etc/src-env.conf but before /etc/make.conf, /etc/src.conf, or OBJDIR
# handling.
# - It is not safe to use .OBJDIR/OBJTOP/OBJROOT here.
# - __ENV_ONLY_OPTIONS have been parsed by now except for opporutunistic
# MK_AUTO_OBJ.
#
.if ${MK_DIRDEPS_BUILD} == "no"
# For AUTO_OBJ many targets do not need object directories created at top-level
# for each visited directory. Only when things are being built are they
# needed. Having AUTO_OBJ disabled in a build target is fine as it should
# fallback to running 'make obj' as needed. If a target is not in this list
# then it is ran with MK_AUTO_OBJ=no in environment.
# 'showconfig' is in the list to avoid forcing MK_AUTO_OBJ=no for it.
AUTO_OBJ_TGT_WHITELIST+= \
_* all all-man build* depend everything *toolchain* includes \
libraries obj objlink showconfig tags xdev xdev-build native-xtools \
stage* create-packages* real-packages sign-packages package-pkg \
tinderbox universe* kernel kernels world worlds bmake
# Only allow AUTO_OBJ for the whitelisted targets. See AUTO_OBJ_TGT_WHITELIST
# above. MK_AUTO_OBJ not checked here for "yes" as it may not yet be enabled
# since it is opportunistic.
.if empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
.for _tgt in ${AUTO_OBJ_TGT_WHITELIST}
.if make(${_tgt})
_CAN_USE_AUTO_OBJ?= yes
.endif
.endfor
.if !defined(_CAN_USE_AUTO_OBJ)
_MAKEARGS+= MK_AUTO_OBJ=no
MK_AUTO_OBJ= no
# This will prevent src.sys.obj.mk from opportunistically enabling AUTO_OBJ
# in this make execution and for sub-makes. For all of these targets we
# just want to read any existing OBJDIR but we don't care if we can create
# or write to them.
.MAKEOVERRIDES+= MK_AUTO_OBJ
.endif
.endif # empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
.endif # ${MK_DIRDEPS_BUILD} == "no"

16
ObsoleteFiles.inc
View File

@ -38,6 +38,22 @@
# xargs -n1 | sort | uniq -d;
# done
# 20171118: Remove old etc capser failes
OLD_FILES+=etc/casper/system.dns
OLD_FILES+=etc/casper/system.grp
OLD_FILES+=etc/casper/system.pwd
OLD_FILES+=etc/casper/system.random
OLD_FILES+=etc/casper/system.sysctl
OLD_DIRS+=etc/casper
# 20171116: lint(1) removal
OLD_FILES+=usr/bin/lint
OLD_FILES+=usr/libexec/lint1
OLD_FILES+=usr/libexec/lint2
OLD_FILES+=usr/libdata/lint/llib-lposix.ln
OLD_FILES+=usr/libdata/lint/llib-lstdc.ln
OLD_FILES+=usr/share/man/man1/lint.1.gz
OLD_FILES+=usr/share/man/man7/lint.7.gz
OLD_DIRS+=usr/libdata/lint
# 20171114: Removal of all fortune datfiles other than freebsd-tips
OLD_FILES+=usr/share/games/fortune/fortunes
OLD_FILES+=usr/share/games/fortune/fortunes.dat

2
UPDATING
View File

@ -66,7 +66,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
20171102:
Building in a FreeBSD src checkout will automatically create object
directories now rather than store files in the current directory if
'make obj' was not ran. Calling 'make obj' is no longer necesarry.
'make obj' was not ran. Calling 'make obj' is no longer necessary.
This feature can be disabled by setting WITHOUT_AUTO_OBJ=yes in
/etc/src-env.conf (not /etc/src.conf), or passing the option in the
environment.

11
cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
View File

@ -1416,8 +1416,15 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
"expected %s to be of type function", s));
}
len = snprintf(NULL, 0, dt_symfmt, dt_symprefix,
objkey, s) + 1;
/*
* Aliases of weak symbols don't get a uniquifier.
*/
if (GELF_ST_BIND(fsym.st_info) == STB_WEAK)
len = snprintf(NULL, 0, dt_weaksymfmt,
dt_symprefix, s) + 1;
else
len = snprintf(NULL, 0, dt_symfmt, dt_symprefix,
objkey, s) + 1;
if ((p = dt_alloc(dtp, len)) == NULL) {
dt_strtab_destroy(strtab);
goto err;

3
etc/Makefile
View File

@ -227,9 +227,6 @@ distribution:
.endif
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
.if ${MK_CASPER} != "no"
${_+_}cd ${.CURDIR}/casper; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install

12
etc/casper/Makefile
View File

@ -1,12 +0,0 @@
# $FreeBSD$
FILES= system.dns
FILES+= system.grp
FILES+= system.pwd
FILES+= system.random
FILES+= system.sysctl
NO_OBJ=
FILESDIR= /etc/casper
.include <bsd.prog.mk>

1
etc/casper/system.dns
View File

@ -1 +0,0 @@
/libexec/casper/dns

1
etc/casper/system.grp
View File

@ -1 +0,0 @@
/libexec/casper/grp

1
etc/casper/system.pwd
View File

@ -1 +0,0 @@
/libexec/casper/pwd

1
etc/casper/system.random
View File

@ -1 +0,0 @@
/libexec/casper/random

1
etc/casper/system.sysctl
View File

@ -1 +0,0 @@
/libexec/casper/sysctl

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

@ -56,8 +56,6 @@
..
ldscripts
..
lint
..
pkgconfig
..
..

4
lib/libc/arm/gen/fabs.c
View File

@ -1,6 +1,8 @@
/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1996 Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without

2
lib/libc/locale/euc.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.

2
lib/libc/mips/SYS.h
View File

@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1996 Jonathan Stone
* All rights reserved.
*

4
lib/libc/mips/gen/fabs.c
View File

@ -1,6 +1,8 @@
/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1996 Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without

4
lib/libc/net/ether_addr.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.

4
lib/libc/rpc/crypt_client.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
lib/libcam/camlib.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
*
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*

5
lib/libcam/scsi_cmdparse.c
View File

@ -1,7 +1,10 @@
/*
* Taken from the original FreeBSD user SCSI library.
*/
/* Copyright (c) 1994 HD Associates
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1994 HD Associates
* (contact: dufault@hda.com)
* All rights reserved.
*

4
lib/libkiconv/xlat16_sysctl.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2000-2001, Boris Popov
* All rights reserved.
*

2
lib/libprocstat/cd9660.c
View File

@ -1,4 +1,6 @@
/*
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2000 Peter Edwards
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.

2
lib/libprocstat/common_kvm.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.

2
lib/libprocstat/libprocstat.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993

4
lib/libprocstat/msdosfs.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2000 Peter Edwards
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.

4
lib/librpcsvc/yp_passwd.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
lib/librpcsvc/yp_update.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
lib/libthr/sys/thr_error.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
* All rights reserved.

4
lib/libthr/thread/thr_attr.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2003 Craig Rodrigues <rodrigc@attbi.com>.
* All rights reserved.
*

4
lib/libthr/thread/thr_autoinit.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2002 Alfred Perlstein <alfred@freebsd.org>.
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.

4
lib/libthr/thread/thr_concurrency.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2003 Sergey Osokin <osa@FreeBSD.org.ru>.
* All rights reserved.
*

4
lib/libthr/thread/thr_getschedparam.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*

4
lib/libthr/thread/thr_init.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2003 Daniel M. Eischen <deischen@freebsd.org>
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.

4
lib/libthr/thread/thr_mutex.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>.
* Copyright (c) 2015, 2016 The FreeBSD Foundation

4
lib/libthr/thread/thr_setschedparam.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*

4
lib/libthr/thread/thr_switch_np.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*

4
lib/msun/bsdsrc/b_exp.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*

4
lib/msun/bsdsrc/b_log.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*

2
lib/msun/bsdsrc/b_tgamma.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*

4
lib/msun/bsdsrc/mathimpl.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*

4
libexec/mknetid/hash.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/mknetid/hash.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/mknetid/mknetid.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/revnetgroup/hash.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/revnetgroup/hash.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/revnetgroup/revnetgroup.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

2
libexec/rtld-elf/malloc.c
View File

@ -61,7 +61,7 @@ static int findbucket();
/*
* Pre-allocate mmap'ed pages
*/
#define NPOOLPAGES (32*1024/pagesz)
#define NPOOLPAGES (128*1024/pagesz)
static caddr_t pagepool_start, pagepool_end;
static int morepages();

4
libexec/ypxfr/yp_dbwrite.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/ypxfr/ypxfr_extern.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/ypxfr/ypxfr_getmap.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/ypxfr/ypxfr_main.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/ypxfr/ypxfr_misc.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

4
libexec/ypxfr/ypxfrd_getmap.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*

10
release/amd64/amd64.conf Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build amd64/amd64.
TARGET="amd64"
TARGET_ARCH="amd64"
KERNEL="GENERIC"

10
release/arm/BANANAPI.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-bananapi"
KERNEL="GENERIC"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="32m -b 1m"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="BANANAPI"
arm_install_uboot() {

10
release/arm/BEAGLEBONE.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
KERNEL="GENERIC"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="2m"
FAT_TYPE="12"
IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="BEAGLEBONE"
arm_install_uboot() {

10
release/arm/CUBIEBOARD.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-cubieboard"
KERNEL="GENERIC"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="32m -b 1m"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="CUBIEBOARD"
arm_install_uboot() {

10
release/arm/CUBIEBOARD2.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-cubieboard2"
KERNEL="GENERIC"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="32m -b 1m"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="CUBIEBOARD2"
arm_install_uboot() {

10
release/arm/CUBOX-HUMMINGBOARD.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
KERNEL="IMX6"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="50m -b 16384"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="IMX6"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="CUBOX-HUMMINGBOARD"
arm_install_uboot() {

10
release/arm/GUMSTIX.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="arm"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-duovero"
KERNEL="GUMSTIX"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="2m"
FAT_TYPE="12"
IMAGE_SIZE="3072M"
KERNEL="GUMSTIX"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
arm_install_uboot() {
UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero"

10
release/arm/PANDABOARD.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
KERNEL="GENERIC"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="2m"
FAT_TYPE="12"
IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="PANDABOARD"
arm_install_uboot() {

23
release/arm/RPI-B.conf
View File

@ -3,22 +3,25 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv6"
EMBEDDEDPORTS="sysutils/u-boot-rpi"
KERNEL="RPI-B"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-rpi sysutils/rpi-firmware"
FAT_SIZE="17m"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="RPI-B"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
arm_install_uboot() {
UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
start.elf start_cd.elf u-boot.img"
RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
UBOOT_FILES="u-boot.bin"
RPI_FIRMWARE_FILES="bootcode.bin config.txt \
fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
start.elf start_cd.elf start_db.elf start_x.elf"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
@ -28,6 +31,10 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
for _UF in ${RPI_FIRMWARE_FILES}; do
chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \

23
release/arm/RPI2.conf
View File

@ -3,23 +3,26 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDEDPORTS="sysutils/u-boot-rpi2"
KERNEL="GENERIC"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-rpi2 sysutils/rpi-firmware"
FAT_SIZE="50m"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="RPI2"
arm_install_uboot() {
UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
UBOOT_FILES="u-boot.bin"
RPI_FIRMWARE_FILES="bootcode.bin config.txt \
fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
start.elf start_cd.elf start_db.elf start_x.elf"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
@ -29,6 +32,10 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
for _UF in ${RPI_FIRMWARE_FILES}; do
chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \

10
release/arm/WANDBOARD.conf
View File

@ -3,17 +3,17 @@
# $FreeBSD$
#
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-wandboard"
KERNEL="IMX6"
IMAGE_SIZE="3072M"
PART_SCHEME="MBR"
FAT_SIZE="50m -b 16384"
FAT_TYPE="16"
IMAGE_SIZE="3072M"
KERNEL="IMX6"
MD_ARGS="-x 63 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="WANDBOARD"
arm_install_uboot() {

11
release/arm64/PINE64.conf
View File

@ -3,18 +3,17 @@
# $FreeBSD$
#
SRCBRANCH="base/head@rHEAD"
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm64"
EMBEDDED_TARGET_ARCH="aarch64"
EMBEDDED_TARGET="arm64"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-pine64"
KERNEL="GENERIC"
IMAGE_SIZE="2560M"
PART_SCHEME="MBR"
FAT_SIZE="54m -b 1m"
FAT_TYPE="16"
IMAGE_SIZE="2560M"
KERNEL="GENERIC"
MD_ARGS="-x 16384 -y 255"
NODOC=1
PART_SCHEME="MBR"
export BOARDNAME="PINE64"
arm_install_uboot() {

30
release/arm64/RPI3.conf
View File

@ -3,22 +3,20 @@
# $FreeBSD$
#
SRCBRANCH="base/head@rHEAD"
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm64"
EMBEDDED_TARGET_ARCH="aarch64"
EMBEDDEDPORTS="sysutils/u-boot-rpi3 security/ca_root_nss"
KERNEL="GENERIC"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
IMAGE_SIZE="2560M"
PART_SCHEME="MBR"
FAT_SIZE="50m -b 1m"
FAT_TYPE="16"
MD_ARGS="-x 63 -y 255"
NODOC=1
DTB_REPO="https://github.com/raspberrypi/firmware/blob/master/boot"
DTB="bcm2710-rpi-3-b.dtb"
EMBEDDED_TARGET_ARCH="aarch64"
EMBEDDED_TARGET="arm64"
EMBEDDEDBUILD=1
EMBEDDEDPORTS="sysutils/u-boot-rpi3 security/ca_root_nss"
FAT_SIZE="50m -b 1m"
FAT_TYPE="16"
IMAGE_SIZE="2560M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
PART_SCHEME="MBR"
export BOARDNAME="RPI3"
arm_install_uboot() {
@ -43,9 +41,9 @@ arm_install_uboot() {
done
BOOTFILES="$(chroot ${CHROOTDIR} \
env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
WITH_UNIFIED_OBJDIR=yes \
make -C ${WORLDDIR}/stand -V .OBJDIR)"
env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
WITH_UNIFIED_OBJDIR=yes \
make -C ${WORLDDIR}/stand -V .OBJDIR)"
BOOTFILES="$(realpath ${BOOTFILES})"
chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT

11
release/arm64/aarch64.conf Normal file
View File

@ -0,0 +1,11 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build arm64/aarch64
# big-iron installation images (not system-on-chip (SoC) images).
TARGET="arm64"
TARGET_ARCH="aarch64"
KERNEL="GENERIC"

12
release/i386/i386.conf Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build i386/i386.
# Note: CHROOT_MAKEENV assumes the build host is amd64.
TARGET="i386"
TARGET_ARCH="i386"
KERNEL="GENERIC"
CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"

1
release/packages/runtime.ucl
View File

@ -20,6 +20,7 @@ scripts: {
post-install = <<EOD
cap_mkdb %CAP_MKDB_ENDIAN% ${PKG_ROOTDIR}/etc/login.conf
pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
services_mkdb %CAP_MKDB_ENDIAN% -q -o ${PKG_ROOTDIR}/var/db/services.db ${PKG_ROOTDIR}/etc/services
chmod 1777 ${PKG_ROOTDIR}/tmp
EOD
}

2
release/picobsd/tinyware/login/pathnames.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*

2
release/picobsd/tinyware/login/pico-login.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*

4
release/picobsd/tinyware/passwd/extern.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*

2
release/picobsd/tinyware/passwd/local_passwd.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*

4
release/picobsd/tinyware/passwd/passwd.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*

2
release/picobsd/tinyware/passwd/pw_copy.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*

2
release/picobsd/tinyware/passwd/pw_util.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*

2
release/picobsd/tinyware/passwd/pw_util.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*

10
release/powerpc/powerpc.conf Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build powerpc/powerpc.
TARGET="powerpc"
TARGET_ARCH="powerpc"
KERNEL="GENERIC"

10
release/powerpc/powerpc64.conf Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build powerpc/powerpc64.
TARGET="powerpc"
TARGET_ARCH="powerpc64"
KERNEL="GENERIC64"

10
release/powerpc/powerpcspe.conf Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build powerpc/powerpcspe.
TARGET="powerpc"
TARGET_ARCH="powerpcspe"
KERNEL="MPC85XXSPE"

4
release/release.sh
View File

@ -252,8 +252,8 @@ chroot_setup() {
extra_chroot_setup() {
mkdir -p ${CHROOTDIR}/dev
mount -t devfs devfs ${CHROOTDIR}/dev
[ -e /etc/resolv.conf ] && cp /etc/resolv.conf \
${CHROOTDIR}/etc/resolv.conf
[ -e /etc/resolv.conf -a ! -e ${CHROOTDIR}/etc/resolv.conf ] && \
cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
# Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints
# is created. This is needed by ports-mgmt/pkg.
eval chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart

10
release/sparc64/sparc64.conf Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
#
# $FreeBSD$
#
# Configuration file for release/release.sh to build sparc64/sparc64.
TARGET="sparc64"
TARGET_ARCH="sparc64"
KERNEL="GENERIC"

4
sbin/bsdlabel/bsdlabel.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1994, 1995 Gordon W. Ross
* Copyright (c) 1994 Theo de Raadt
* All rights reserved.

4
sbin/etherswitchcfg/ifmedia.c
View File

@ -1,7 +1,9 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
/* $FreeBSD$ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997 Jason R. Thorpe.
* All rights reserved.
*

4
sbin/ffsinfo/ffsinfo.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.

2
sbin/fsck_ffs/pass5.c
View File

@ -35,6 +35,7 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define IN_RTLD /* So we pickup the P_OSREL defines */
#include <sys/param.h>
#include <sys/sysctl.h>
@ -73,6 +74,7 @@ pass5(void)
newcg->cg_niblk = fs->fs_ipg;
if (preen == 0 && yflag == 0 && fs->fs_magic == FS_UFS2_MAGIC &&
fswritefd != -1 && (fs->fs_metackhash & CK_CYLGRP) == 0 &&
getosreldate() >= P_OSREL_CK_CYLGRP &&
reply("ADD CYLINDER GROUP CHECKSUM PROTECTION") != 0) {
fs->fs_metackhash |= CK_CYLGRP;
rewritecg = 1;

4
sbin/growfs/debug.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.

4
sbin/growfs/debug.h
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.

4
sbin/growfs/growfs.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 2012 The FreeBSD Foundation

2
sbin/gvinum/gvinum.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998
* Nan Yang Computer Services Limited. All rights reserved.
*

4
sbin/ifconfig/ifmedia.c
View File

@ -1,7 +1,9 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
/* $FreeBSD$ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997 Jason R. Thorpe.
* All rights reserved.
*

4
sbin/ifconfig/ifvlan.c
View File

@ -1,4 +1,6 @@
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1999 Bill Paul <wpaul@ctr.columbia.edu>
* Copyright (c) 2012 ADARA Networks, Inc.
* All rights reserved.

3
sbin/newfs/mkfs.c
View File

@ -44,6 +44,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define IN_RTLD /* So we pickup the P_OSREL defines */
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/file.h>
@ -495,7 +496,7 @@ mkfs(struct partition *pp, char *fsys)
/*
* Set flags for metadata that is being check-hashed.
*/
if (Oflag > 1)
if (Oflag > 1 && getosreldate() >= P_OSREL_CK_CYLGRP)
sblock.fs_metackhash = CK_CYLGRP;
/*

5
sbin/pfctl/parse.y
View File

@ -4390,8 +4390,11 @@ route_host : STRING {
$$->tail = $$;
}
| '(' STRING host ')' {
struct node_host *n;
$$ = $3;
$$->ifname = $2;
for (n = $3; n != NULL; n = n->next)
n->ifname = $2;
}
;

4
sbin/rcorder/ealloc.c
View File

@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1989 by Berkeley Softworks

4
sbin/rcorder/hash.c
View File

@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks

4
sbin/rcorder/hash.h
View File

@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $NetBSD: hash.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks

5
sbin/rcorder/sprite.h
View File

@ -1,6 +1,8 @@
/* $NetBSD: sprite.h,v 1.1 1999/11/23 05:28:22 mrg Exp $ */
/*
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1989 by Berkeley Softworks
@ -38,6 +40,7 @@
* SUCH DAMAGE.
*
* from: @(#)sprite.h 8.1 (Berkeley) 6/6/93
* $FreeBSD$
*/
/*

Some files were not shown because too many files have changed in this diff Show More