Skip to content

Commit

Permalink
*: upgrade to 10.1 as a bulk commit
Browse files Browse the repository at this point in the history
Taken from: freebsd.git@29f4af53a2c8248b634f48923da8eb35f5ed0515
  • Loading branch information
fichtner committed Feb 10, 2015
1 parent a96e74a commit 87f480a
Show file tree
Hide file tree
Showing 13,891 changed files with 1,105,529 additions and 486,454 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 0 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ binutils obrien Insists on BU blocked from unapproved commits
file obrien Insists to keep file blocked from other's unapproved
commits
contrib/bzip2 obrien Pre-commit review required.
lukemftpd obrien Pre-commit review required.
geom_concat pjd Pre-commit review preferred.
geom_eli pjd Pre-commit review preferred.
geom_gate pjd Pre-commit review preferred.
Expand Down Expand Up @@ -110,7 +109,6 @@ lib/libbluetooth emax Pre-commit review preferred.
lib/libsdp emax Pre-commit review preferred.
usr.bin/bluetooth emax Pre-commit review preferred.
usr.sbin/bluetooth emax Pre-commit review preferred.
gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
*env(3) secteam Due to the problematic security history of this
code, please have patches reviewed by secteam.
share/zoneinfo edwin Heads-up appreciated, since our data is coming
Expand Down
28 changes: 24 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
# targets - Print a list of supported TARGET/TARGET_ARCH pairs
# for world and kernel targets.
# toolchains - Build a toolchain for all world and kernel targets.
# xdev - xdev-build + xdev-install for the architecture
# specified with XDEV and XDEV_ARCH.
# xdev-build - Build cross-development tools.
# xdev-install - Install cross-development tools.
#
# "quick" way to test all kernel builds:
# _jflag=`sysctl -n hw.ncpu`
Expand Down Expand Up @@ -248,8 +252,17 @@ tinderbox toolchains kernel-toolchains: .MAKE
${TGTS}:
${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}

# Set a reasonable default
.MAIN: all
# The historic default "all" target creates files which may cause stale
# or (in the cross build case) unlinkable results. Fail with an error
# when no target is given. The users can explicitly specify "all"
# if they want the historic behavior.
.MAIN: _guard

_guard:
@echo
@echo "Explicit target required (use \"all\" for historic behavior)"
@echo
@false

STARTTIME!= LC_ALL=C date
CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo
Expand Down Expand Up @@ -341,7 +354,8 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
-DNO_CPU_CFLAGS -DNO_WERROR \
DESTDIR= MK_TESTS=no PROGNAME=${MYMAKE:T}

make bmake: .PHONY
@echo
Expand Down Expand Up @@ -459,9 +473,15 @@ universe_kernels: universe_kernconfs
.if !defined(TARGET)
TARGET!= uname -m
.endif
.if defined(MAKE_ALL_KERNELS)
_THINNER=cat
.else
_THINNER=xargs grep -L "^.NO_UNIVERSE"
.endif
KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \
find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
! -name DEFAULTS ! -name NOTES
! -name DEFAULTS ! -name NOTES | \
${_THINNER}
universe_kernconfs:
.for kernel in ${KERNCONFS}
TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \
Expand Down
Loading

0 comments on commit 87f480a

Please sign in to comment.