diff options
author | gjb <gjb@FreeBSD.org> | 2015-05-01 18:07:18 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2015-05-01 18:07:18 +0000 |
commit | 55e5b36d38ff95ded004ed97fe9ed303abb36184 (patch) | |
tree | ca54c9ba1af0ca2eb29e395b069252993a4e1ada /release | |
parent | dfb432f9b57e5f768243247ed35fbe38bb9c40f1 (diff) | |
parent | fecee76e5a26a3b0a0cac30b34c660389e57579e (diff) | |
download | FreeBSD-src-55e5b36d38ff95ded004ed97fe9ed303abb36184.zip FreeBSD-src-55e5b36d38ff95ded004ed97fe9ed303abb36184.tar.gz |
MFH: r281855-r282312
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile.ec2 | 16 | ||||
-rw-r--r-- | release/arm/BEAGLEBONE.conf | 2 | ||||
-rw-r--r-- | release/arm/PANDABOARD.conf | 2 | ||||
-rw-r--r-- | release/arm/RPI-B.conf | 2 | ||||
-rw-r--r-- | release/arm/WANDBOARD-QUAD.conf | 2 | ||||
-rw-r--r-- | release/arm/ZEDBOARD.conf | 2 | ||||
-rwxr-xr-x | release/arm64/make-memstick.sh | 2 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.xml | 139 | ||||
-rw-r--r-- | release/doc/share/xml/release.ent | 1 | ||||
-rw-r--r-- | release/doc/share/xml/sponsor.ent | 6 | ||||
-rwxr-xr-x | release/scripts/mk-vmimage.sh | 10 | ||||
-rw-r--r-- | release/tools/vmimage.subr | 19 |
12 files changed, 169 insertions, 34 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 869ebc1..f74d320 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -12,13 +12,17 @@ AMINAMESUFFIX!= date +-%Y-%m-%d PUBLISH= --public .endif -ec2ami: cw-ec2 -.if !exists(/usr/local/bin/bsdec2-image-upload) - @echo "--------------------------------------------------------------" - @echo ">>> Creating EC2 AMIs requires bsdec2-image-upload" - @echo "--------------------------------------------------------------" - @false +cw-ec2-portinstall: +.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) + make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean +.else +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -y +. endif + env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload .endif + +ec2ami: cw-ec2 cw-ec2-portinstall .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index 546af5c..4efb61d 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -33,5 +33,5 @@ load_target_env() { export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="BEAGLEBONE" export CROCHETSRC="https://github.com/freebsd/crochet" - export CROCHETBRANCH="trunk@r744" + export CROCHETBRANCH="trunk@rHEAD" } diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf index 9518914..dc8952d 100644 --- a/release/arm/PANDABOARD.conf +++ b/release/arm/PANDABOARD.conf @@ -33,5 +33,5 @@ load_target_env() { export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="PANDABOARD" export CROCHETSRC="https://github.com/freebsd/crochet" - export CROCHETBRANCH="trunk@r744" + export CROCHETBRANCH="trunk@rHEAD" } diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index 19778f8..aae60c9 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -33,7 +33,7 @@ load_target_env() { export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="RPI-B" export CROCHETSRC="https://github.com/freebsd/crochet" - export CROCHETBRANCH="trunk@r744" + export CROCHETBRANCH="trunk@rHEAD" export UBOOTSRC="https://github.com/gonzoua/u-boot-pi" export UBOOTBRANCH="trunk" export UBOOTDIR="/tmp/crochet/u-boot-rpi" diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf index 48aa631..c3fff91 100644 --- a/release/arm/WANDBOARD-QUAD.conf +++ b/release/arm/WANDBOARD-QUAD.conf @@ -33,5 +33,5 @@ load_target_env() { export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="WANDBOARD-QUAD" export CROCHETSRC="https://github.com/freebsd/crochet" - export CROCHETBRANCH="trunk@r744" + export CROCHETBRANCH="trunk@rHEAD" } diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf index 07c35ba..4d0a461 100644 --- a/release/arm/ZEDBOARD.conf +++ b/release/arm/ZEDBOARD.conf @@ -32,5 +32,5 @@ load_target_env() { export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="ZEDBOARD" export CROCHETSRC="https://github.com/freebsd/crochet" - export CROCHETBRANCH="trunk@r744" + export CROCHETBRANCH="trunk@rHEAD" } diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh index 09edfad..27ebf27 100755 --- a/release/arm64/make-memstick.sh +++ b/release/arm64/make-memstick.sh @@ -36,6 +36,6 @@ if [ $? -ne 0 ]; then fi rm ${1}/etc/fstab -mkimg -s gpt -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2} +mkimg -s mbr -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.part -o ${2} rm ${2}.part diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml index d3f82d7..1528435 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: 278934 --> + <!-- Last rev: 282146 --> <copyright> <year>2015</year> @@ -316,7 +316,24 @@ <para revision="279571" contrib="sponsor" sponsor="&scaleengine;">The &man.freebsd-update.8; utility has been updated to prevent fetching updated binary patches when - a previous upgrade has not been throughly completed.</para> + a previous upgrade has not been thoroughly completed.</para> + + <para revision="279122" contrib="sponsor" + sponsor="&juniper;">The &man.netstat.1; utility has been + updated to link against the &man.libxo.3; shared + library.</para> + + <para revision="280870">A regression in the &man.libarchive.3; + library that would prevent a directory from being included in + the archive when <literal>--one-file-system</literal> is used + has been fixed.</para> + + <para revision="281311" contrib="sponsor" sponsor="&ff;">The + &man.ar.1; utility has been updated to set + <literal>ARCHIVE_EXTRACT_SECURE_SYMLINKS</literal> and + <literal>ARCHIVE_EXTRACT_SECURE_NODOTDOT</literal> to disallow + directory traversal when extracting an archive, similar to + &man.tar.1;.</para> </sect2> <sect2 xml:id="userland-contrib"> @@ -335,9 +352,6 @@ <para revision="261071">&man.jemalloc.3; has been updated to version 3.5.0.</para> - <para revision="261212"><application>bmake</application> has - been updated to version 20140101.</para> - <para revision="261283"><application>libc++</application> has been updated to version 3.4.</para> @@ -379,6 +393,7 @@ <application>addr2line</application>, <application>elfcopy (strip)</application>, <application>nm</application>, + <application>readelf</application>, <application>size</application>, and <application>strings</application> were switched to the versions from the ELF Tool Chain project.</para> @@ -388,17 +403,34 @@ adding <acronym>UTF-8</acronym> support to the &man.sh.1; shell.</para> - <para revision="277270"><application>OpenSSL</application> has - been updated to version 1.0.1l.</para> - - <para revision="278433">The &man.xz.1; utility has been udpated - to version 5.2.0.</para> - <para revision="278433">The &man.xz.1; utility has been updated to support multi-threaded compression.</para> - <para revision="278970">The &man.acpi.4; subsystem has been - updated to version 20150204.</para> + <para revision="280297"><application>OpenSSL</application> has + been updated to version 1.0.1m.</para> + + <para revision="280932" contrib="sponsor" sponsor="&ff;">The + <application>elftoolchain</application> utilities have been + updated to version 3179.</para> + + <para revision="281316">The &man.xz.1; utility has been updated + to version 5.2.1.</para> + + <para revision="281373">The &man.nvi.1; utility has been updated + to version 2.1.3.</para> + + <para revision="281396">The &man.acpi.4; subsystem has been + updated to version 20150410.</para> + + <para revision="281806">The &man.wpa.supplicant.8; and + &man.hostapd.8; utilties have been updated to version + 2.4.</para> + + <para revision="281812"><application>bmake</application> has + been updated to version 20150418.</para> + + <para revision="282089">The &man.unbound.8; utility has been + updated to version 1.5.3.</para> </sect2> <sect2 xml:id="userland-installer"> @@ -481,6 +513,10 @@ <acronym>ELF</acronym> object in the <literal>dlpi_name</literal> structure member.</para> + <para revision="273562" contrib="sponsor" + sponsor="&juniper;">The &man.libxo.3; library has been + imported to the base system.</para> + <para revision="273806" contrib="sponsor" sponsor="&chelsio;">A userland library for Chelsio Terminator 5 based iWARP cards has been added, allowing userland <acronym>RDMA</acronym> @@ -509,6 +545,15 @@ updated to be able to handle 32-bit aligned data on 64-bit platforms, also providing a significant improvement in 32-bit workloads.</para> + + <para revision="281130">Several standard include headers have + been updated to use of <application>gcc</application> + attributes, such as <literal>__result_use_check()</literal>, + <literal>__alloc_size()</literal>, and + <literal>__nonnull()</literal>.</para> + + <para revision="281845">Support for file verification in + <acronym>MAC</acronym> has been added.</para> </sect2> <sect2 xml:id="userland-abi"> @@ -547,6 +592,30 @@ <para revision="272089">A bug in &man.ipfw.4; that could potentially lead to a kernel panic when using &man.dummynet.4; at layer 2 has been fixed.</para> + + <para revision="280930" contrib="sponsor" sponsor="&mitail;">The + kernel <acronym>RPC</acronym> has been updated to include + several enhancements:</para> + + <itemizedlist> + <listitem> + <para>The 45 MiB limit on requests queued for + &man.nfsd.8; threads has been removed.</para> + </listitem> + + <listitem> + <para>Avoids unnecessary throttling by not deferring + accounting for completed requests.</para> + </listitem> + + <listitem> + <para>Fixes an integer overflow and signedness bugs.</para> + </listitem> + </itemizedlist> + + <para revision="281261" arch="powerpc">Support for + &man.dtrace.1; has been added for the + Book-E ™.</para> </sect2> <sect2 xml:id="kernel-config"> @@ -604,6 +673,14 @@ <para revision="279361">The <literal>kern.osrelease</literal> and <literal>kern.osreldate</literal> are now configurable &man.jail.8; parameters.</para> + + <para revision="280308,280949" contrib="sponsor" + sponsor="&ix;, &ff;">The &man.devfs.5; device filesystem has + been changed to update timestamps for read/write operations + using seconds precision. A new &man.sysctl.8;, + <literal>vfs.devfs.dotimes</literal> has been added, which + when set to a non-zero value, enables default precision + timestamps for these operations.</para> </sect2> </sect1> @@ -642,6 +719,9 @@ <filename>/dev/hpet<replaceable>N</replaceable></filename> device, providing access to <acronym>HPET</acronym> from userspace.</para> + + <para revision="280183">The <literal>drm</literal> code has + been updated to match &linux; version 3.8.13.</para> </sect2> <sect2 xml:id="drivers-storage"> @@ -676,6 +756,9 @@ <para revision="276526">The <literal>asr(4)</literal> driver has been removed, and is no longer supported.</para> + + <para revision="281387">The &man.hptnr.4; driver has been + updated to version 1.1.1.</para> </sect2> <sect2 xml:id="drivers-network"> @@ -768,6 +851,10 @@ driver has been updated to correct performance counter sampling on G4 (MPC74xxx) and G5 class processors.</para> + <para revision="281713" arch="powerpc">The &man.hwpmc.4; + driver has been updated to support the Freescale e500 + core.</para> + <para revision="275732" contrib="sponsor" sponsor="&ff;,&netgate;">The <application>OpenCrypto</application> framework has been @@ -819,6 +906,14 @@ <para revision="273515">The &man.virtio.console.4; driver has been added, which provides an interface to VirtIO console devices through a &man.tty.4; device.</para> + + <para revision="279957">The &man.bhyve.8; hypervisor has been + updated to support <literal>DSM TRIM</literal> commands for + virtual <acronym>AHCI</acronym> disks.</para> + + <para revision="281439" arch="arm">Support for the + <application>QEMU</application> <literal>virt</literal> system + has been added.</para> </sect2> <sect2 xml:id="hardware-arm"> @@ -835,6 +930,10 @@ driver has been added, which supports <acronym>CPU</acronym> frequency and voltage control on the Raspberry Pi <acronym>SOC</acronym>.</para> + + <para revision="280259" contrib="sponsor" sponsor="&ff;">Initial + support for the ARM AArch64 architecture has been + added.</para> </sect2> </sect1> @@ -846,6 +945,7 @@ <sect2 xml:id="storage-general"> <title>General Storage</title> + <para revision="278037" contrib="sponsor" sponsor="&ix;">The &man.ctl.4; <acronym>LUN</acronym> mapping has been rewritten, replacing <acronym>iSCSI</acronym>-specific mapping mechanisms @@ -907,6 +1007,12 @@ Alternatively, &man.syscons.4; can be enabled at boot time by entering <literal>set kern.vty=sc</literal> at the &man.loader.8; prompt.</para> + + <para revision="281616">The boot loader has been updated to + support entering the <acronym>GELI</acronym> passphrase before + loading the kernel. To enable this behavior, add + <literal>geom_eli_passphrase_prompt="YES"</literal> to + &man.loader.conf.5;.</para> </sect2> <sect2 xml:id="boot-menu"> @@ -1002,6 +1108,13 @@ </tbody> </tgroup> </informaltable> + + <para revision="280971" contrib="sponsor" + sponsor="&netflix;, &nginx;">Support for <acronym>IP</acronym> + identification for atomic datagrams (<acronym>RFC</acronym> + 6864) has been added. Support for this feature can be toggled + with the <literal>net.inet.ip.rfc6864</literal> + &man.sysctl.8;, which is enabled by default.</para> </sect2> </sect1> diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent index e02a5f6..f72b4d0 100644 --- a/release/doc/share/xml/release.ent +++ b/release/doc/share/xml/release.ent @@ -70,6 +70,7 @@ <!-- Architecture names --> <!ENTITY arch.amd64 "amd64"> <!ENTITY arch.arm "arm"> +<!ENTITY arch.arm64 "aarch64"> <!ENTITY arch.i386 "i386"> <!ENTITY arch.mips "mips"> <!ENTITY arch.pc98 "pc98"> diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent index 6e77d0d..91cfe65 100644 --- a/release/doc/share/xml/sponsor.ent +++ b/release/doc/share/xml/sponsor.ent @@ -23,12 +23,18 @@ <!ENTITY google "Google"> +<!ENTITY juniper "Juniper Networks, Inc."> + <!ENTITY ix "iXsystems"> <!ENTITY limelight "Limelight Networks"> <!ENTITY lsi "LSI"> +<!ENTITY mitail "MIT Computer Science & Artificial Intelligence Laboratory"> + +<!ENTITY netflix "Netflix"> <!ENTITY netgate "Netgate"> +<!ENTITY nginx "Nginx, Inc."> <!ENTITY sandvine "Sandvine, Inc."> <!ENTITY scaleengine "ScaleEngine, Inc."> diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index d5985ce..fd84216 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -93,6 +93,16 @@ main() { . "${VMCONFIG}" fi + case ${TARGET}:${TARGET_ARCH} in + arm64:aarch64) + ROOTLABEL="ufs" + NOSWAP=1 + ;; + *) + ROOTLABEL="gpt" + ;; + esac + vm_create_base vm_install_base vm_extra_install_base diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 1a295e5..d4cfc2d 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -30,10 +30,9 @@ write_partition_layout() { -o ${VMIMAGE} ;; arm64:aarch64) - mkimg -s gpt \ - -p efi/efiboot:=${BOOTFILES}/efi/boot1/boot1.efifat \ - ${SWAPOPT} \ - -p freebsd-ufs/rootfs:=${VMBASE} \ + mkimg -s mbr \ + -p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \ + -p freebsd:=${VMBASE} \ -o ${VMIMAGE} ;; powerpc:powerpc*) @@ -77,7 +76,7 @@ vm_create_base() { mkdir -p ${DESTDIR} truncate -s ${VMSIZE} ${VMBASE} mddev=$(mdconfig -f ${VMBASE}) - newfs /dev/${mddev} + newfs -L rootfs /dev/${mddev} mount /dev/${mddev} ${DESTDIR} return 0 @@ -97,7 +96,7 @@ vm_copy_base() { truncate -s ${VMSIZE} ${VMBASE}.tmp mkdir -p ${DESTDIR}/new mdnew=$(mdconfig -f ${VMBASE}.tmp) - newfs /dev/${mdnew} + newfs -L rootfs /dev/${mdnew} mount /dev/${mdnew} ${DESTDIR}/new tar -cf- -C ${DESTDIR}/old . | tar -xUf- -C ${DESTDIR}/new @@ -123,7 +122,7 @@ vm_install_base() { echo '# Custom /etc/fstab for FreeBSD VM images' \ > ${DESTDIR}/etc/fstab - echo '/dev/gpt/rootfs / ufs rw 1 1' \ + echo "/dev/${ROOTLABEL}/rootfs / ufs rw 1 1" \ >> ${DESTDIR}/etc/fstab if [ -z "${NOSWAP}" ]; then echo '/dev/gpt/swapfs none swap sw 0 0' \ @@ -182,8 +181,10 @@ vm_extra_install_ports() { } vm_extra_pre_umount() { - # Prototype. When overridden, installs additional ports within the - # virtual machine environment. + # Prototype. When overridden, performs additional tasks within the + # virtual machine environment prior to unmounting the filesystem. + # Note: When overriding this function, removing resolv.conf in the + # disk image must be included. rm -f ${DESTDIR}/etc/resolv.conf return 0 |