aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-06 11:50:30 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-06 11:50:30 +0000
commit2252f43bdceb37482c978c760ecc37f82f34d422 (patch)
tree759e7355bf352e43e4a156a773a28d3d9fdbcad7 /release
parentde7df74b4855cd9bdd01583a12409d5b1e6da354 (diff)
parent8a6dbb6455abdcc3271b7789b55e10e9c57f4414 (diff)
downloadsrc-2252f43bdceb37482c978c760ecc37f82f34d422.tar.gz
src-2252f43bdceb37482c978c760ecc37f82f34d422.zip
MFH: r282315-r282534
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-arm-redux/; revision=282535
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.ec213
-rw-r--r--release/arm/BEAGLEBONE.conf1
-rw-r--r--release/arm/RPI2.conf38
-rwxr-xr-xrelease/arm/release.sh5
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.xml55
-rw-r--r--release/doc/share/xml/sponsor.ent2
-rwxr-xr-xrelease/release.sh1
-rw-r--r--release/tools/arm/crochet-BEAGLEBONE.conf11
-rw-r--r--release/tools/arm/crochet-RPI2.conf29
9 files changed, 147 insertions, 8 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index f74d32027a7d..f7f34a6fab79 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -12,6 +12,15 @@ AMINAMESUFFIX!= date +-%Y-%m-%d
PUBLISH= --public
.endif
+CLEANFILES+= ec2ami
+
+.if !exists(/usr/local/bin/bsdec2-image-upload)
+CW_EC2_PORTINSTALL= cw-ec2-portinstall
+CLEANFILES+= ${CW_EC2_PORTINSTALL}
+.else
+CW_EC2_PORTINSTALL=
+.endif
+
cw-ec2-portinstall:
.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
@@ -21,8 +30,9 @@ cw-ec2-portinstall:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload
.endif
+ @touch ${.TARGET}
-ec2ami: cw-ec2 cw-ec2-portinstall
+ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
.if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
@echo "--------------------------------------------------------------"
@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"
@@ -46,3 +56,4 @@ ec2ami: cw-ec2 cw-ec2-portinstall
"${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \
"${TYPE} ${REVISION}-${BRANCH}" \
${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
+ @touch ${.TARGET}
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 4efb61d20bec..72337f831cc3 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -13,6 +13,7 @@ export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
export CHROOTDIR="/scratch"
export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
# Build chroot configuration
load_chroot_env() {
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
new file mode 100644
index 000000000000..bb8ebe998ca9
--- /dev/null
+++ b/release/arm/RPI2.conf
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="sysutils/u-boot-rpi2"
+
+# Build chroot configuration
+load_chroot_env() {
+ # Avoid collision with TARGET and XDEV.
+ unset XDEV XDEV_ARCH KERNEL
+ export TARGET="amd64"
+ export TARGET_ARCH="amd64"
+}
+
+# Build target configuration
+load_target_env() {
+ # Avoid collision with TARGET and XDEV.
+ unset TARGET TARGET_ARCH
+ export XDEV="arm"
+ export XDEV_ARCH="armv6"
+ export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+ export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+ export KERNEL="RPI2"
+ export CROCHETSRC="https://github.com/freebsd/crochet"
+ export CROCHETBRANCH="trunk@rHEAD"
+}
+
diff --git a/release/arm/release.sh b/release/arm/release.sh
index 104edd8cb32d..c68f812c7043 100755
--- a/release/arm/release.sh
+++ b/release/arm/release.sh
@@ -42,11 +42,6 @@ before_build() {
KNOWNHASH=
UBOOT_VERSION=
case ${KERNEL} in
- BEAGLEBONE)
- WANT_UBOOT=1
- KNOWNHASH="7b6444bd23eb61068c43bd1d44ec7e7bfdbce5cadeca20c833eee186b4d3fd31"
- UBOOT_VERSION="u-boot-2014.04"
- ;;
PANDABOARD)
WANT_UBOOT=1
KNOWNHASH="e08e20a6979bfca6eebb9a2b0e42aa4416af3d796332fd63a3470495a089d496"
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 1528435f1aa5..b6ea140e804a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -22,7 +22,7 @@
<pubdate>$FreeBSD$</pubdate>
- <!-- Last rev: 282146 -->
+ <!-- Last rev: 282482 -->
<copyright>
<year>2015</year>
@@ -334,6 +334,17 @@
<literal>ARCHIVE_EXTRACT_SECURE_NODOTDOT</literal> to disallow
directory traversal when extracting an archive, similar to
&man.tar.1;.</para>
+
+ <para revision="282208" contrib="sponsor"
+ sponsor="&multiplay;">The &man.chflags.1;, &man.chgrp.1;,
+ &man.chmod.1;, and &man.chown.8; utilities now affect symbolic
+ links when the <literal>-R</literal> flag is specified, as
+ documented in &man.symlink.7;.</para>
+
+ <para revision="281617">A race condition in &man.wc.1; that
+ would cause final results to be sent to &man.stderr.4; when
+ receiving the <literal>SIGINFO</literal> signal has been
+ fixed.</para>
</sect2>
<sect2 xml:id="userland-contrib">
@@ -423,7 +434,7 @@
updated to version 20150410.</para>
<para revision="281806">The &man.wpa.supplicant.8; and
- &man.hostapd.8; utilties have been updated to version
+ &man.hostapd.8; utilities have been updated to version
2.4.</para>
<para revision="281812"><application>bmake</application> has
@@ -431,6 +442,10 @@
<para revision="282089">The &man.unbound.8; utility has been
updated to version 1.5.3.</para>
+
+ <para revision="282434" contrib="sponsor" sponsor="&ff;">The
+ &man.resolvconf.8; utility has been updated to version
+ 3.7.0.</para>
</sect2>
<sect2 xml:id="userland-installer">
@@ -681,6 +696,13 @@
<literal>vfs.devfs.dotimes</literal> has been added, which
when set to a non-zero value, enables default precision
timestamps for these operations.</para>
+
+ <para revision="282213" contrib="sponsor" sponsor="&ff;">A new
+ &man.sysctl.8;, <literal>kern.racct.enable</literal>, has been
+ added, which when set to a non-zero value allows using
+ &man.rctl.8; with the <literal>GENERIC</literal> kernel.
+ A new kernel configuration option,
+ <literal>RACCT_DISABLED</literal> has also been added.</para>
</sect2>
</sect1>
@@ -914,6 +936,30 @@
<para revision="281439" arch="arm">Support for the
<application>QEMU</application> <literal>virt</literal> system
has been added.</para>
+
+ <para revision="282212" contrib="sponsor" sponsor="&msostc;">The
+ HyperV&trade; drivers have been updated with several
+ enhancements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The &man.hv.vmbus.4; driver now has multi-channel
+ support.</para>
+ </listitem>
+
+ <listitem>
+ <para>The &man.hv.storvsc.4; driver now has scatter/gather
+ support, in addition to performance improvements.</para>
+ </listitem>
+
+ <listitem>
+ <para>The &man.hv.kvp.4; driver has received several bug
+ fixes.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para revision="282274">Support for &man.xen.4; para-virtualized
+ <literal>domU</literal> kernels has been removed.</para>
</sect2>
<sect2 xml:id="hardware-arm">
@@ -1175,6 +1221,11 @@
been updated to use multi-threaded &man.xz.1;. By default,
the number of &man.xz.1; threads is set to the number of cores
available.</para>
+
+ <para revision="281802" contrib="sponsor" sponsor="&ff;">The
+ Release Engineering build tools have been updated to include
+ support for building &os;/&arch.arm64; virtual machine and
+ memory stick installation images.</para>
</sect2>
</sect1>
</article>
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index 91cfe65c1e26..19787a2b32a5 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -30,7 +30,9 @@
<!ENTITY limelight "Limelight Networks">
<!ENTITY lsi "LSI">
+<!ENTITY msostc "Microsoft Open Source Technology Center">
<!ENTITY mitail "MIT Computer Science &amp; Artificial Intelligence Laboratory">
+<!ENTITY multiplay "Multiplay">
<!ENTITY netflix "Netflix">
<!ENTITY netgate "Netgate">
diff --git a/release/release.sh b/release/release.sh
index d2573715023b..a822d783c59d 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -240,6 +240,7 @@ fi
# Embedded builds do not use the 'make release' target.
if [ -n "${EMBEDDEDBUILD}" ]; then
+ buildenv_setup
# If a crochet configuration file exists in *this* checkout of
# release/, copy it to the /tmp/external directory within the chroot.
# This allows building embedded releases without relying on updated
diff --git a/release/tools/arm/crochet-BEAGLEBONE.conf b/release/tools/arm/crochet-BEAGLEBONE.conf
index e72814fbdca7..7a32542ed0f9 100644
--- a/release/tools/arm/crochet-BEAGLEBONE.conf
+++ b/release/tools/arm/crochet-BEAGLEBONE.conf
@@ -27,3 +27,14 @@ FREEBSD_WORLD_EXTRA_ARGS=""
FREEBSD_KERNEL_EXTRA_ARGS=""
FREEBSD_EXTRA_ARGS=""
IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img
+BEAGLEBONE_UBOOT=/tmp/external/u-boot-beaglebone
+
+beaglebone_check_uboot() {
+ mkdir -p "${BEAGLEBONE_UBOOT}"
+ ln -fs /usr/local/share/u-boot/u-boot-beaglebone/MLO \
+ ${BEAGLEBONE_UBOOT}/MLO
+ ln -fs /usr/local/share/u-boot/u-boot-beaglebone/u-boot.img \
+ ${BEAGLEBONE_UBOOT}/bb-uboot.img
+ ln -fs ${BOARDDIR}/files/uEnv.txt \
+ ${BEAGLEBONE_UBOOT}/bb-uenv.txt
+}
diff --git a/release/tools/arm/crochet-RPI2.conf b/release/tools/arm/crochet-RPI2.conf
new file mode 100644
index 000000000000..7ecab4ca5b44
--- /dev/null
+++ b/release/tools/arm/crochet-RPI2.conf
@@ -0,0 +1,29 @@
+#
+# $FreeBSD$
+#
+
+# This is the configuration file for use with crochet to produce
+# FreeBSD Raspberry Pi 2 images.
+
+board_setup RaspberryPi2
+option ImageSize 1gb
+option Growfs
+
+export MAKEOBJDIRPREFIX=/usr/obj
+FREEBSD_SRC=/usr/src
+__MAKE_CONF=/dev/null
+SRCCONF=/dev/null
+WORKDIR=/usr/obj
+_BRANCH=$(make -C ${FREEBSD_SRC}/release -V BRANCH)
+_REVISION=$(make -C ${FREEBSD_SRC}/release -V REVISION)
+KERNCONF=RPI2
+TARGET=arm
+TARGET_ARCH=armv6
+FREEBSD_BUILDWORLD_EXTRA_ARGS="${WORLD_FLAGS}"
+FREEBSD_BUILDKERNEL_EXTRA_ARGS="${KERNEL_FLAGS}"
+FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
+FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
+FREEBSD_WORLD_EXTRA_ARGS=""
+FREEBSD_KERNEL_EXTRA_ARGS=""
+FREEBSD_EXTRA_ARGS=""
+IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img