diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-07-17 12:51:19 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-17 12:51:19 -0500 |
| commit | f873d15ebf1ab8674a347f0ab8292ed2954470b7 (patch) | |
| tree | 44b01296225ab164231f61667a4b6049e3de178b /release | |
| parent | bd302c9ec7c180f660fa00cba5eeb9fc5af729f7 (diff) | |
| parent | d0036f09237f420d5c56063a793387a35da2cf2c (diff) | |
| download | FreeBSD-src-f873d15ebf1ab8674a347f0ab8292ed2954470b7.zip FreeBSD-src-f873d15ebf1ab8674a347f0ab8292ed2954470b7.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'release')
28 files changed, 1041 insertions, 336 deletions
diff --git a/release/Makefile b/release/Makefile index b1dfa82..12bd53f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -265,8 +265,8 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} touch ${.TARGET} pkg-stage: -.if !defined(NOPKG) - env REPOS_DIR=${.CURDIR}/pkg_repos/ \ +.if !defined(NOPKG) || empty(NOPKG) + env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ sh ${.CURDIR}/scripts/pkg-stage.sh mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 45a08e4..b413ea5 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -51,7 +51,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} @echo "--------------------------------------------------------------" @false .endif - /usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov \ + /usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov --ena \ ${.OBJDIR}/ec2.raw \ "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \ "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \ diff --git a/release/Makefile.vm b/release/Makefile.vm index 180ce5b..9ccd057 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -8,6 +8,7 @@ VMTARGETS= vm-image VMFORMATS?= vhd vmdk qcow2 raw VMSIZE?= 20G +SWAPSIZE?= 1G VMBASE?= vm VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image @@ -54,11 +55,11 @@ ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf cw-${_CW:tl}: mkdir -p ${.OBJDIR}/${.TARGET} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW}CONF} + -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW:tu}CONF} touch ${.TARGET} cw${_CW:tl}-package: @@ -88,7 +89,7 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} mkdir -p ${.OBJDIR}/${.TARGET} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \ diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index f9bb162..b6c8f56 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -28,6 +28,10 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \ + ${UFSMOUNT}/boot/dtb/am335x-bone.dtb + chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone-black.dtb \ + ${UFSMOUNT}/boot/dtb/am335x-boneblack.dtb chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} diff --git a/release/arm/CUBIEBOARD2.conf b/release/arm/CUBIEBOARD2.conf index e7cfab6..a170214 100644 --- a/release/arm/CUBIEBOARD2.conf +++ b/release/arm/CUBIEBOARD2.conf @@ -30,6 +30,8 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/cubieboard2.dtb \ + ${UFSMOUNT}/boot/dtb/sun7i-a20-cubieboard2.dtb chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml index b27224f..3a8c033 100644 --- a/release/doc/en_US.ISO8859-1/errata/article.xml +++ b/release/doc/en_US.ISO8859-1/errata/article.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" - "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" - "http://www.FreeBSD.org/release/XML/release.ent"> + "http://www.FreeBSD.org/release/XML/release.ent"> %release; <!ENTITY % sponsor PUBLIC "-//FreeBSD//ENTITIES Sponsor Specification//EN" "sponsor.ent"> %sponsor; @@ -13,10 +13,10 @@ ]> <article xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - version="5.0"> + xmlns:xlink="http://www.w3.org/1999/xlink" + version="5.0"> <info> - <title>&os; &release; Errata </title> + <title>&os; &release; Errata</title> <author><orgname>The &os; Project</orgname></author> @@ -25,7 +25,8 @@ <copyright> <year>2016</year> - <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> + <holder role="mailto:doc@FreeBSD.org">The &os; Documentation + Project</holder> </copyright> <legalnotice xml:id="trademarks" role="trademarks"> @@ -37,45 +38,44 @@ <abstract> <para>This document lists errata items for &os; &release;, - containing significant information discovered after the release - or too late in the release cycle to be otherwise included in the - release documentation. - This information includes security advisories, as well as news - relating to the software or documentation that could affect its - operation or usability. An up-to-date version of this document - should always be consulted before installing this version of + containing significant information discovered after the + release or too late in the release cycle to be otherwise + included in the release documentation. This information + includes security advisories, as well as news relating to the + software or documentation that could affect its operation or + usability. An up-to-date version of this document should + always be consulted before installing this version of &os;.</para> - <para>This errata document for &os; &release; - will be maintained until the release of &os; &release.next;.</para> + <para>This errata document for &os; &release; will be maintained + until the release of &os; &release.next;.</para> </abstract> </info> <sect1 xml:id="intro"> <title>Introduction</title> - <para>This errata document contains <quote>late-breaking news</quote> - about &os; &release; - Before installing this version, it is important to consult this - document to learn about any post-release discoveries or problems - that may already have been found and fixed.</para> + <para>This errata document contains <quote>late-breaking + news</quote> about &os; &release; Before installing this + version, it is important to consult this document to learn about + any post-release discoveries or problems that may already have + been found and fixed.</para> <para>Any version of this errata document actually distributed with the release (for example, on a CDROM distribution) will be out of date by definition, but other copies are kept updated on the Internet and should be consulted as the <quote>current - errata</quote> for this release. These other copies of the - errata are located at - <link xlink:href="https://www.FreeBSD.org/releases/" />, - plus any sites - which keep up-to-date mirrors of this location.</para> + errata</quote> for this release. These other copies of the + errata are located at <link + xlink:href="https://www.FreeBSD.org/releases/" />, plus any + sites which keep up-to-date mirrors of this location.</para> <para>Source and binary snapshots of &os; &release.branch; also contain up-to-date copies of this document (as of the time of the snapshot).</para> - <para>For a list of all &os; CERT security advisories, see - <link xlink:href="https://www.FreeBSD.org/security/"/>.</para> + <para>For a list of all &os; CERT security advisories, see <link + xlink:href="https://www.FreeBSD.org/security/"/>.</para> </sect1> <sect1 xml:id="security"> diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml index 42a2c51..780e7a8 100644 --- a/release/doc/en_US.ISO8859-1/hardware/article.xml +++ b/release/doc/en_US.ISO8859-1/hardware/article.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" - "../../../share/xml/freebsd50.dtd" [ + "../../../share/xml/freebsd50.dtd" [ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent"> %release; <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "nonexistent"> %devauto; ]> -<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - <info><title>&os; &release.current; Hardware Notes</title> - +<article xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - <author><orgname>The &os; Documentation Project</orgname></author> + <info> + <title>&os; &release.current; Hardware Notes</title> + + <author> + <orgname>The &os; Documentation Project</orgname> + </author> <pubdate>$FreeBSD$</pubdate> @@ -33,7 +37,8 @@ <year>2015</year> <year>2016</year> <year>2017</year> - <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> + <holder role="mailto:doc@FreeBSD.org">The &os; Documentation + Project</holder> </copyright> <legalnotice xml:id="trademarks" role="trademarks"> @@ -112,8 +117,8 @@ </listitem> <listitem> - <para>The single-core &intel; &xeon; - processors <quote>Nocona</quote>, <quote>Irwindale</quote>, + <para>The single-core &intel; &xeon; processors + <quote>Nocona</quote>, <quote>Irwindale</quote>, <quote>Potomac</quote>, and <quote>Cranford</quote> have EM64T support.</para> </listitem> @@ -132,7 +137,8 @@ </listitem> <listitem> - <para>All &intel; ¢rino; Duo and ¢rino; Pro platforms</para> + <para>All &intel; ¢rino; Duo and ¢rino; Pro + platforms</para> </listitem> <listitem> @@ -142,11 +148,11 @@ </listitem> <listitem> - <para>Some &intel; &pentium; 4s and &celeron; Ds using - the <quote>Prescott</quote> core have EM64T support. See - the <link xlink:href="http://processorfinder.intel.com">Intel - Processor Spec Finder</link> for the definitive answer about - EM64T support in Intel processors.</para> + <para>Some &intel; &pentium; 4s and &celeron; Ds using the + <quote>Prescott</quote> core have EM64T support. See the + <link xlink:href="http://processorfinder.intel.com">Intel + Processor Spec Finder</link> for the definitive answer + about EM64T support in Intel processors.</para> </listitem> </itemizedlist> @@ -171,14 +177,14 @@ <title>i386</title> <para>&os;/&arch.i386; runs on a wide variety of <quote>IBM PC - compatible</quote> machines. Due to the wide range of + compatible</quote> machines. Due to the wide range of hardware available for this architecture, it is impossible to exhaustively list all combinations of equipment supported by &os;. Nevertheless, some general guidelines are presented here.</para> <para>Almost all &i386;-compatible processors with a floating - point unit are supported. All &intel; processors beginning + point unit are supported. All &intel; processors beginning with the 80486 are supported, including the 80486, &pentium;, &pentium; Pro, &pentium; II, &pentium; III, &pentium; 4, and variants thereof, such as the &xeon; and &celeron; processors. @@ -248,11 +254,13 @@ (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found - at the <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link> - section of the <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link> project - Web site. &os; can use these DSDTs to override the DSDT - provided by the BIOS; see the &man.acpi.4; manual page for - more information.</para> + at the <link + xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link> + section of the <link + xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link> + project Web site. &os; can use these DSDTs to override the + DSDT provided by the BIOS; see the &man.acpi.4; manual page + for more information.</para> </sect2> <sect2 xml:id="proc-pc98"> @@ -287,8 +295,8 @@ <sect2 xml:id="proc-powerpc"> <title>powerpc</title> - <para>All Apple PowerPC machines with built-in USB are supported, - as well a limited selection of non-Apple machines, + <para>All Apple PowerPC machines with built-in USB are + supported, as well a limited selection of non-Apple machines, including KVM on POWER7</para> <para>SMP is supported on all systems with more than @@ -299,8 +307,8 @@ <title>sparc64</title> <para>This section describes the systems currently known to be - supported by &os; on the Fujitsu &sparc64; and Sun &ultrasparc; - platforms.</para> + supported by &os; on the Fujitsu &sparc64; and Sun + &ultrasparc; platforms.</para> <para>SMP is supported on all systems with more than 1 processor.</para> @@ -310,8 +318,8 @@ supported by the &man.creator.4; (Sun Creator, Sun Creator3D and Sun Elite3D) or &man.machfb.4; (Sun PGX and Sun PGX64 as well as the ATI Mach64 chips found onboard in for example - &sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and &sun.ultra; 10) - driver must use the serial console.</para> + &sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and + &sun.ultra; 10) driver must use the serial console.</para> <para>If you have a system that is not listed here, it may not have been tested with &os; &release.current;. We encourage @@ -456,10 +464,11 @@ </itemizedlist> <para>The following systems are partially supported by &os;. In - particular the fiber channel controllers in SBus-based systems are not - supported. However, it is possible to use these with a SCSI controller - supported by the &man.esp.4; driver (Sun ESP SCSI, Sun FAS Fast-SCSI - and Sun FAS366 Fast-Wide SCSI controllers).</para> + particular the fiber channel controllers in SBus-based systems + are not supported. However, it is possible to use these with + a SCSI controller supported by the &man.esp.4; driver (Sun ESP + SCSI, Sun FAS Fast-SCSI and Sun FAS366 Fast-Wide SCSI + controllers).</para> <itemizedlist> <listitem> @@ -471,9 +480,9 @@ </listitem> </itemizedlist> - <para>Starting with 7.2-RELEASE, &arch.sparc64; systems based on Sun - &ultrasparc; III and beyond are also supported by &os;, which includes - the following known working systems:</para> + <para>Starting with 7.2-RELEASE, &arch.sparc64; systems based on + Sun &ultrasparc; III and beyond are also supported by &os;, + which includes the following known working systems:</para> <itemizedlist> <listitem> @@ -501,7 +510,8 @@ </listitem> <listitem> - <para>&sun.fire; V215 (support first appeared in 7.3-RELEASE and 8.1-RELEASE)</para> + <para>&sun.fire; V215 (support first appeared in 7.3-RELEASE + and 8.1-RELEASE)</para> </listitem> <listitem> @@ -509,7 +519,8 @@ </listitem> <listitem> - <para>&sun.fire; V245 (support first appeared in 7.3-RELEASE and 8.1-RELEASE)</para> + <para>&sun.fire; V245 (support first appeared in 7.3-RELEASE + and 8.1-RELEASE)</para> </listitem> <listitem> @@ -522,9 +533,10 @@ </listitem> <listitem> - <para>&sun.fire; V480 (501-6780 and 501-6790 centerplanes only, for - which support first appeared in 7.3-RELEASE and 8.1-RELEASE, - other centerplanes might work beginning with 8.3-RELEASE and 9.0-RELEASE)</para> + <para>&sun.fire; V480 (501-6780 and 501-6790 centerplanes + only, for which support first appeared in 7.3-RELEASE and + 8.1-RELEASE, other centerplanes might work beginning with + 8.3-RELEASE and 9.0-RELEASE)</para> </listitem> <listitem> @@ -532,8 +544,9 @@ </listitem> <listitem> - <para>&sun.fire; V890 (support first appeared in 7.4-RELEASE and 8.1-RELEASE, - non-mixed &ultrasparc; IV/IV+ CPU-configurations only)</para> + <para>&sun.fire; V890 (support first appeared in 7.4-RELEASE + and 8.1-RELEASE, non-mixed &ultrasparc; IV/IV+ + CPU-configurations only)</para> </listitem> <listitem> @@ -542,7 +555,7 @@ </itemizedlist> <para>The following Sun &ultrasparc; systems are not tested but - believed to be also supported by &os;:</para> + believed to be supported by &os; as well:</para> <itemizedlist> <listitem> @@ -550,14 +563,16 @@ </listitem> <listitem> - <para>&sun.fire; V490 (support first appeared in 7.4-RELEASE and 8.1-RELEASE, - non-mixed &ultrasparc; IV/IV+ CPU-configurations only)</para> + <para>&sun.fire; V490 (support first appeared in 7.4-RELEASE + and 8.1-RELEASE, non-mixed &ultrasparc; IV/IV+ + CPU-configurations only)</para> </listitem> </itemizedlist> - <para>Starting with 7.4-RELEASE and 8.1-RELEASE, &arch.sparc64; systems based on - Fujitsu &sparc64; V are also supported by &os;, which - includes the following known working systems:</para> + <para>Starting with 7.4-RELEASE and 8.1-RELEASE, &arch.sparc64; + systems based on Fujitsu &sparc64; V are also supported by + &os;, which includes the following known working + systems:</para> <itemizedlist> <listitem> @@ -565,8 +580,8 @@ </listitem> </itemizedlist> - <para>The following Fujitsu &primepower; systems are not tested but - believed to be also supported by &os;:</para> + <para>The following Fujitsu &primepower; systems are not tested + but believed to be supported by &os; as well:</para> <itemizedlist> <listitem> @@ -605,11 +620,11 @@ is highly recommended to try to keep the formatting of this section consistent. - We give manpage references using the &man entities where - possible. If a driver has no manpage (and consequently no + We give manual page references using the &man entities where + possible. If a driver has no manual page (and consequently no &man entity, we simply give the name of the driver). Please avoid doing &man entity conversions unless you - know for sure that an entity and manpage exist; sweeps through + know for sure that an entity and manual page exist; sweeps through this file to fix "missed" conversions are likely to break the build. --> @@ -682,7 +697,7 @@ <note> <para>[&arch.amd64;, &arch.i386;] Booting from these - controllers is supported. EISA adapters are not + controllers is supported. EISA adapters are not supported.</para> </note> @@ -712,7 +727,7 @@ <note> <para>[&arch.amd64;, &arch.i386;] Booting from these - controllers is supported. EISA adapters are not + controllers is supported. EISA adapters are not supported.</para> </note> @@ -765,8 +780,8 @@ support CD-ROM commands are supported for read-only access by the CD-ROM drivers (such as &man.cd.4;). WORM/CD-R/CD-RW writing support is provided by &man.cdrecord.1;, which is a - part of the <package>sysutils/cdrtools</package> port in the Ports - Collection.</para> + part of the <package>sysutils/cdrtools</package> port in the + Ports Collection.</para> <para>The following CD-ROM type systems are supported at this time:</para> @@ -898,6 +913,8 @@ &hwlist.pcn; + &hwlist.qlnxe; + &hwlist.qlxgb; &hwlist.qlxgbe; @@ -1018,8 +1035,8 @@ 4965AGN IEEE 802.11n PCI network adapters (&man.iwn.4; driver)</para> - <para>[&arch.i386;, &arch.amd64;] Marvell Libertas IEEE 802.11b/g - PCI network adapters (&man.malo.4; driver)</para> + <para>[&arch.i386;, &arch.amd64;] Marvell Libertas IEEE + 802.11b/g PCI network adapters (&man.malo.4; driver)</para> <para>Marvell 88W8363 IEEE 802.11n wireless network adapters (&man.mwl.4; driver)</para> @@ -1030,8 +1047,8 @@ &hwlist.rsu; - <para>Realtek RTL8188CE based PCIe IEEE 802.11b/g/n wireless network - adapters (&man.rtwn.4; driver)</para> + <para>Realtek RTL8188CE based PCIe IEEE 802.11b/g/n wireless + network adapters (&man.rtwn.4; driver)</para> &hwlist.rum; @@ -1145,12 +1162,13 @@ </listitem> <listitem> - <para>[&arch.amd64;, &arch.i386;] Avlab Technology, PCI IO 2S - and PCI IO 4S</para> + <para>[&arch.amd64;, &arch.i386;] Avlab Technology, PCI IO + 2S and PCI IO 4S</para> </listitem> <listitem> - <para>[&arch.amd64;, &arch.i386;] Comtrol RocketPort 550</para> + <para>[&arch.amd64;, &arch.i386;] Comtrol RocketPort + 550</para> </listitem> <listitem> @@ -1220,7 +1238,7 @@ <listitem> <para>[&arch.amd64;, &arch.i386;] SIIG Cyber 4S PCI - 16C550/16C650/16C850</para> + 16C550/16C650/16C850</para> </listitem> <listitem> @@ -1303,7 +1321,7 @@ <note> <para>"flags 0x15000?01" is necessary in kernel - configuration.</para> + configuration.</para> </note> <para>[&arch.pc98;] Media Intelligent RSB-384 (&man.sio.4; @@ -1451,8 +1469,9 @@ </note> <note> - <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] - USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para> + <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] USB Bluetooth + adapters can be found in <link + linkend="bluetooth">Bluetooth</link> section.</para> </note> &hwlist.ohci; @@ -1574,7 +1593,8 @@ <note> <para>Information regarding specific video cards and compatibility with <application>Xorg</application> can be - found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para> + found at <uri + xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para> </note> <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] @@ -1629,7 +1649,8 @@ <note> <para>&man.moused.8; has more information on using pointing devices with &os;. Information on using pointing devices - with <application>Xorg</application> can be found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para> + with <application>Xorg</application> can be found at <uri + xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para> </note> <para>[&arch.amd64;, &arch.i386;] <quote>PC standard</quote> @@ -1662,8 +1683,9 @@ </itemizedlist> <para>[&arch.i386;] Xilinx XC6200-based reconfigurable hardware - cards compatible with the HOT1 from <link xlink:href="http://www.vcc.com/">Virtual Computers</link> (xrpu - driver).</para> + cards compatible with the HOT1 from <link + xlink:href="http://www.vcc.com/">Virtual Computers</link> + (xrpu driver).</para> <para>[&arch.pc98;] Power Management Controller of NEC PC-98 Note (pmc driver)</para> diff --git a/release/doc/en_US.ISO8859-1/installation/Makefile b/release/doc/en_US.ISO8859-1/installation/Makefile new file mode 100644 index 0000000..53ec9837 --- /dev/null +++ b/release/doc/en_US.ISO8859-1/installation/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +RELN_ROOT?= ${.CURDIR}/../.. +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/installation +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/installation +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +# SGML content +SRCS+= article.xml + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/release/doc/en_US.ISO8859-1/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.xml new file mode 100644 index 0000000..e9bb888 --- /dev/null +++ b/release/doc/en_US.ISO8859-1/installation/article.xml @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ +<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" + "http://www.FreeBSD.org/release/XML/share/xml/release.ent"> +%release; +<!ENTITY local.rel "11.1"> +]> + +<article xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" + xml:id="top"> + + <info> + <title>&os; &release.current; Installation + Instructions</title> + + <author> + <orgname>The &os; Project</orgname> + </author> + + <pubdate>$FreeBSD$</pubdate> + + <copyright> + <year>2017</year> + <holder role="mailto:doc@FreeBSD.org">The &os; Documentation + Project</holder> + </copyright> + + <legalnotice xml:id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> + + <abstract> + <para>This article gives some brief instructions on installing + &os; &release.current; and upgrading the systems running + earlier releases.</para> + </abstract> + </info> + + <sect1 xml:id="install"> + <title>Installing &os;</title> + + <para>The <uri + xlink:href="&url.books.handbook;/bsdinstall.html">Installing + &os;</uri> chapter of the <uri + xlink:href="&url.books.handbook;/">&os; Handbook</uri> + provides more in-depth information about the installation + program itself, including a guided walk-through with + screenshots.</para> + </sect1> + + <sect1 xml:id="upgrade"> + <title>Upgrading &os;</title> + + <para>If you are upgrading from a previous release of &os;, please + read <uri + xlink:href="http://www.FreeBSD.org/releases/&local.rel;R/relnotes.html#upgrade">upgrading + section in the Release Notes</uri> for notable + incompatibilities carefully.</para> + + <sect2 xml:id="upgrade-source"> + <title>Upgrading from Source</title> + + <para>The procedure for doing a source code based update is + described in <uri + xlink:href="&url.books.handbook;/synching.html"></uri> and + <uri + xlink:href="&url.books.handbook;/makeworld.html"></uri>.</para> + + <para>For SVN use the <filename>releng/&local.rel;</filename> + branch which will be where any upcoming Security Advisories or + Errata Notices will be applied.</para> + </sect2> + + <sect2 xml:id="upgrade-binary"> + <title>Upgrading Using <quote>&os; Update</quote></title> + + <para>The &man.freebsd-update.8; utility supports binary + upgrades of &arch.i386; and &arch.amd64; systems running + earlier FreeBSD releases. Systems running + <literal>10.3-RELEASE</literal>, + <literal>11.0-RELEASE</literal> can upgrade as follows:</para> + + <screen>&prompt.root; freebsd-update fetch +&prompt.root; freebsd-update install</screen> + + <para>Now the &man.freebsd-update.8; utility can fetch bits + belonging to &release.current;. During this process + &man.freebsd-update.8; will ask for help in merging + configuration files.</para> + + <screen>&prompt.root; freebsd-update upgrade -r &local.rel;-RELEASE</screen> + + <screen>&prompt.root; freebsd-update install</screen> + + <para>The system must now be rebooted with the newly installed + kernel before the non-kernel components are updated.</para> + + <screen>&prompt.root; shutdown -r now</screen> + + <para>After rebooting, &man.freebsd-update.8; needs to be run + again to install the new userland components:</para> + + <screen>&prompt.root; freebsd-update install</screen> + + <para>At this point, users of systems being upgraded from + earlier &os; releases will be prompted by + &man.freebsd-update.8; to rebuild all third-party applications + (e.g., ports installed from the ports tree) due to updates in + system libraries.</para> + + <para>After updating installed third-party applications (and + again, only if &man.freebsd-update.8; printed a message + indicating that this was necessary), run + &man.freebsd-update.8; again so that it can delete the old (no + longer used) system libraries:</para> + + <screen>&prompt.root; freebsd-update install</screen> + + <para>Finally, reboot into &release.current;</para> + + <screen>&prompt.root; shutdown -r now</screen> + </sect2> + </sect1> +</article> diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml index ffebcc3..f98b801 100644 --- a/release/doc/en_US.ISO8859-1/readme/article.xml +++ b/release/doc/en_US.ISO8859-1/readme/article.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" - "../../../share/xml/freebsd50.dtd" [ + "../../../share/xml/freebsd50.dtd" [ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent"> %release; ]> -<!-- +<!-- Local Variables: mode: sgml sgml-indent-data: t @@ -12,9 +12,11 @@ sgml-always-quote-attributes: t End: --> -<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - <info><title>&os; &release.current; README</title> - +<article xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> + + <info> + <title>&os; &release.current; README</title> <author><orgname>The &os; Project</orgname></author> @@ -37,7 +39,10 @@ <year>2013</year> <year>2014</year> <year>2015</year> - <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> + <year>2016</year> + <year>2017</year> + <holder role="mailto:doc@FreeBSD.org">The &os; Documentation + Project</holder> </copyright> <legalnotice xml:id="trademarks" role="trademarks"> @@ -48,35 +53,36 @@ &tm-attrib.general; </legalnotice> - <abstract> - <para>This document gives a brief introduction to &os; - &release.current;. It includes some information on how to - obtain &os;, a listing of various ways to contact the &os; - Project, and pointers to some other sources of - information.</para> - </abstract> + <abstract> + <para>This document gives a brief introduction to &os; + &release.current;. It includes some information on how to + obtain &os;, a listing of various ways to contact the &os; + Project, and pointers to some other sources of + information.</para> + </abstract> </info> <sect1 xml:id="intro"> <title>Introduction</title> - <para>This distribution is a &release.type; of &os; &release.current;, the - latest point along the &release.branch; branch.</para> + <para>This distribution is a &release.type; of &os; + &release.current;, the latest point along the &release.branch; + branch.</para> <sect2> <title>About &os;</title> <para>&os; is an operating system based on 4.4 BSD Lite for AMD64 and Intel EM64T based PC hardware (&arch.amd64;), - Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC hardware (&arch.i386;), - NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;), - and &ultrasparc; machines (&arch.sparc64;). Versions - for the &arm; (&arch.arm;), &mips; (&arch.mips;), and - &powerpc; (&arch.powerpc;) architectures are currently under - development as well. &os; works with a wide variety of - peripherals and configurations and can be used for everything - from software development to games to Internet Service - Provision.</para> + Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC + hardware (&arch.i386;), NEC PC-9801/9821 series PCs and + compatibles (&arch.pc98;), and &ultrasparc; machines + (&arch.sparc64;). Versions for the &arm; (&arch.arm;), &mips; + (&arch.mips;), and &powerpc; (&arch.powerpc;) architectures + are currently under development as well. &os; works with + a wide variety of peripherals and configurations and can be + used for everything from software development to games to + Internet Service Provision.</para> <para>This release of &os; contains everything you need to run such a system, including full source code for the kernel and @@ -88,61 +94,63 @@ <para>A large collection of third-party ported software (the <quote>Ports Collection</quote>) is also provided to make it - easy to obtain and install all your favorite traditional &unix; - utilities for &os;. Each <quote>port</quote> consists of a - set of scripts to retrieve, configure, build, and install a - piece of software, with a single command. Over &os.numports; - ports, from editors to programming languages to graphical - applications, make &os; a powerful and comprehensive operating - environment that extends far beyond what's provided by many - commercial versions of &unix;. Most ports are also available as - pre-compiled <quote>packages</quote>, which can be quickly - installed from the installation program.</para> + easy to obtain and install all your favorite traditional + &unix; utilities for &os;. Each <quote>port</quote> consists + of a set of scripts to retrieve, configure, build, and install + a piece of software, with a single command. Over + &os.numports; ports, from editors to programming languages to + graphical applications, make &os; a powerful and comprehensive + operating environment that extends far beyond what's provided + by many commercial versions of &unix;. Most ports are also + available as pre-compiled <quote>packages</quote>, which can + be quickly installed from the installation program.</para> </sect2> <sect2> <title>Target Audience</title> - <para releasetype="current">This &release.type; is aimed primarily at early adopters - and various other users who want to get involved with the - ongoing development of &os;. While the &os; development team - tries its best to ensure that each &release.type; works as - advertised, &release.branch; is very much a - work-in-progress.</para> - - <para releasetype="current">The basic requirements for using this &release.type; are - technical proficiency with &os; and an understanding of the - ongoing development process of &os; &release.branch; (as - discussed on the &a.current;).</para> - - <para releasetype="current">For those more interested in doing business with &os; than - in experimenting with new &os; technology, formal releases - (such as &release.prev.stable;) are frequently more appropriate. - Releases undergo a period of testing and quality assurance - checking to ensure high reliability and dependability.</para> - - <para releasetype="snapshot">This &release.type; is aimed primarily at early adopters - and various other users who want to get involved with the - ongoing development of &os;. While the &os; development team - tries its best to ensure that each &release.type; works as - advertised, &release.branch; is very much a - work-in-progress.</para> - - <para releasetype="snapshot">The basic requirements for using this &release.type; are - technical proficiency with &os; and an understanding of the - ongoing development process of &os; &release.branch; (as - discussed on the &a.current;).</para> - - <para releasetype="snapshot">For those more interested in doing business with &os; than - in experimenting with new &os; technology, formal releases - (such as &release.prev.stable;) are frequently more appropriate. - Releases undergo a period of testing and quality assurance - checking to ensure high reliability and dependability.</para> - - <para releasetype="release">This &release.type; of &os; is suitable for all users. It - has undergone a period of testing and quality assurance - checking to ensure the highest reliability and - dependability.</para> + <para releasetype="current">This &release.type; is aimed + primarily at early adopters and various other users who want + to get involved with the ongoing development of &os;. While + the &os; development team tries its best to ensure that each + &release.type; works as advertised, &release.branch; is very + much a work-in-progress.</para> + + <para releasetype="current">The basic requirements for using + this &release.type; are technical proficiency with &os; and an + understanding of the ongoing development process of &os; + &release.branch; (as discussed on the &a.current;).</para> + + <para releasetype="current">For those more interested in doing + business with &os; than in experimenting with new &os; + technology, formal releases (such as &release.prev.stable;) + are frequently more appropriate. Releases undergo a period of + testing and quality assurance checking to ensure high + reliability and dependability.</para> + + <para releasetype="snapshot">This &release.type; is aimed + primarily at early adopters and various other users who want + to get involved with the ongoing development of &os;. While + the &os; development team tries its best to ensure that each + &release.type; works as advertised, &release.branch; is very + much a work-in-progress.</para> + + <para releasetype="snapshot">The basic requirements for using + this &release.type; are technical proficiency with &os; and an + understanding of the ongoing development process of &os; + &release.branch; (as discussed on the &a.current;).</para> + + <para releasetype="snapshot">For those more interested in doing + business with &os; than in experimenting with new &os; + technology, formal releases (such as &release.prev.stable;) + are frequently more appropriate. Releases undergo a period of + testing and quality assurance checking to ensure high + reliability and dependability.</para> + + <para releasetype="release">This &release.type; of &os; is + suitable for all users. It has undergone a period of testing + and quality assurance checking to ensure the highest + reliability and dependability.</para> </sect2> </sect1> @@ -166,17 +174,27 @@ Collection, or other extra material.</para> <para>A list of the CDROM and DVD publishers known to the - project are listed in the <link xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining - &os;</quote></link> appendix to the Handbook.</para> + project are listed in the <link + xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining + &os;</quote></link> appendix to the Handbook.</para> + </sect2> + + <sect2> + <title>HTTPS</title> + + <para>&os; releases may be downloaded via + <acronym>HTTPS</acronym> from <uri + xlink:href="https://download.FreeBSD.org/">https://download.FreeBSD.org/</uri>, + which is the official &os; release site.</para> </sect2> <sect2> <title>FTP</title> <para>You can use FTP to retrieve &os; and any or all of its - optional packages from <uri xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri>, which is the official - &os; release site, or any of its - <quote>mirrors</quote>.</para> + optional packages from <uri + xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri>, + or any of its <quote>mirrors</quote>.</para> <para>Lists of locations that mirror &os; can be found in the <link xlink:href="&url.books.handbook;/mirrors-ftp.html">FTP @@ -187,8 +205,9 @@ <para>Additional mirror sites are always welcome. Contact <email>freebsd-admin@FreeBSD.org</email> for more details on becoming an official mirror site. You can also find useful - information for mirror sites at the <link xlink:href="&url.articles.hubs;/">Mirroring - &os;</link> article.</para> + information for mirror sites at the <link + xlink:href="&url.articles.hubs;/">Mirroring &os;</link> + article.</para> <para>Mirrors generally contain the ISO images generally used to create a CDROM of a &os; release. They usually also contain @@ -208,16 +227,18 @@ <para>For any questions or general technical support issues, please send mail to the &a.questions;.</para> - <para>If you're tracking the &release.branch; development efforts, you - <emphasis>must</emphasis> join the &a.current;, in order to - keep abreast of recent developments and changes that may - affect the way you use and maintain the system.</para> + <para>If you are tracking the &release.branch; development + efforts, you <emphasis>must</emphasis> join the &a.current;, + in order to keep abreast of recent developments and changes + that may affect the way you use and maintain the + system.</para> - <para>Being a largely-volunteer effort, the &os; - Project is always happy to have extra hands willing to help—there are already far more desired enhancements than - there is time to implement them. To contact the developers on - technical matters, or with offers of help, please send mail to - the &a.hackers;.</para> + <para>Being a largely-volunteer effort, the &os; Project is + always happy to have extra hands willing to help—there + are already far more desired enhancements than there is time + to implement them. To contact the developers on technical + matters, or with offers of help, please send mail to the + &a.hackers;.</para> <para>Please note that these mailing lists can experience <emphasis>significant</emphasis> amounts of traffic. If you @@ -226,13 +247,15 @@ preferable to subscribe instead to the &a.announce;.</para> <para>All of the mailing lists can be freely joined by anyone - wishing to do so. Visit the <link xlink:href="&url.base;/mailman/listinfo"> - &os; Mailman Info Page</link>. This will give you more - information on joining the various lists, accessing archives, - etc. There are a number of mailing lists targeted at special - interest groups not mentioned here; more information can be - obtained either from the Mailman pages or the <link xlink:href="&url.base;/support.html#mailing-list">mailing - lists section</link> of the &os; Web site.</para> + wishing to do so. Visit the <link + xlink:href="&url.base;/mailman/listinfo">&os; Mailman Info + Page</link>. This will give you more information on joining + the various lists, accessing archives, etc. There are + a number of mailing lists targeted at special interest groups + not mentioned here; more information can be obtained either + from the Mailman pages or the <link + xlink:href="&url.base;/support.html#mailing-list">mailing + lists section</link> of the &os; Web site.</para> <important> <para>Do <emphasis>not</emphasis> send email to the lists @@ -286,48 +309,48 @@ provided in various formats. Most distributions will include both ASCII text (<filename>.TXT</filename>) and HTML (<filename>.HTM</filename>) renditions. Some distributions - may also include other formats such as Portable Document Format - (<filename>.PDF</filename>). - - <itemizedlist> - <listitem> - <para><filename>README.TXT</filename>: This file, which - gives some general information about &os; as well as - some cursory notes about obtaining a - distribution.</para> - </listitem> - - <listitem> - <para><filename>RELNOTES.TXT</filename>: The release - notes, showing what's new and different in &os; - &release.current; compared to the previous release (&os; - &release.prev;).</para> - </listitem> - - <listitem> - <para><filename>HARDWARE.TXT</filename>: The hardware - compatibility list, showing devices with which &os; has - been tested and is known to work.</para> - </listitem> - - <listitem> - <para><filename>ERRATA.TXT</filename>: Release errata. - Late-breaking, post-release information can be found in - this file, which is principally applicable to releases - (as opposed to snapshots). It is important to consult - this file before installing a release of &os;, as it - contains the latest information on problems which have - been found and fixed since the release was - created.</para> - </listitem> - </itemizedlist> - </para> + may also include other formats such as Portable Document + Format (<filename>.PDF</filename>).</para> + + <itemizedlist> + <listitem> + <para><filename>README.TXT</filename>: This file, which + gives some general information about &os; as well as + some cursory notes about obtaining a + distribution.</para> + </listitem> + + <listitem> + <para><filename>RELNOTES.TXT</filename>: The release + notes, showing what's new and different in &os; + &release.current; compared to the previous release (&os; + &release.prev;).</para> + </listitem> + + <listitem> + <para><filename>HARDWARE.TXT</filename>: The hardware + compatibility list, showing devices with which &os; has + been tested and is known to work.</para> + </listitem> + + <listitem> + <para><filename>ERRATA.TXT</filename>: Release errata. + Late-breaking, post-release information can be found in + this file, which is principally applicable to releases + (as opposed to snapshots). It is important to consult + this file before installing a release of &os;, as it + contains the latest information on problems which have + been found and fixed since the release was + created.</para> + </listitem> + </itemizedlist> <para>On platforms that support &man.bsdinstall.8; (currently - &arch.amd64;, &arch.i386;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the - Documentation menu during installation. Once the system is - installed, you can revisit this menu by re-running the - &man.bsdinstall.8; utility.</para> + &arch.amd64;, &arch.i386;, &arch.pc98;, and &arch.sparc64;), + these documents are generally available via the Documentation + menu during installation. Once the system is installed, you + can revisit this menu by re-running the &man.bsdinstall.8; + utility.</para> <note> <para>It is extremely important to read the errata for any @@ -338,8 +361,9 @@ other copies are kept updated on the Internet and should be consulted as the <quote>current errata</quote> for this release. These other copies of the errata are located at - <uri xlink:href="&url.base;/releases/">&url.base;/releases/</uri> (as - well as any sites which keep up-to-date mirrors of this + <uri + xlink:href="&url.base;/releases/">&url.base;/releases/</uri> + (as well as any sites which keep up-to-date mirrors of this location).</para> </note> </sect2> @@ -347,18 +371,19 @@ <sect2> <title>Manual Pages</title> - <para>As with almost all &unix; like operating systems, &os; comes - with a set of on-line manual pages, accessed through the - &man.man.1; command or through the <link xlink:href="http://www.FreeBSD.org/cgi/man.cgi">hypertext manual - pages gateway</link> on the &os; Web site. In general, the - manual pages provide information on the different commands and - APIs available to the &os; user.</para> + <para>As with almost all &unix; like operating systems, &os; + comes with a set of on-line manual pages, accessed through the + &man.man.1; command or through the <link + xlink:href="http://www.FreeBSD.org/cgi/man.cgi">hypertext + manual pages gateway</link> on the &os; Web site. In + general, the manual pages provide information on the different + commands and APIs available to the &os; user.</para> <para>In some cases, manual pages are written to give information on particular topics. Notable examples of such - manual pages are &man.tuning.7; (a guide to performance tuning), - &man.security.7; (an introduction to &os; security), and - &man.style.9; (a style guide to kernel coding).</para> + manual pages are &man.tuning.7; (a guide to performance + tuning), &man.security.7; (an introduction to &os; security), + and &man.style.9; (a style guide to kernel coding).</para> </sect2> <sect2> @@ -366,31 +391,34 @@ <para>Two highly-useful collections of &os;-related information, maintained by the &os; Project, - are the &os; Handbook and &os; FAQ (Frequently Asked - Questions document). On-line versions of the <link xlink:href="&url.books.handbook;/">Handbook</link> - and <link xlink:href="&url.books.faq;/">FAQ</link> - are always available from the <link xlink:href="&url.base;/docs.html">&os; Documentation - page</link> or its mirrors. If you install the + are the &os; Handbook and &os; FAQ (Frequently Asked Questions + document). On-line versions of the <link + xlink:href="&url.books.handbook;/">Handbook</link> and <link + xlink:href="&url.books.faq;/">FAQ</link> are always + available from the <link + xlink:href="&url.base;/docs.html">&os; Documentation + page</link> or its mirrors. If you install the <filename>doc</filename> distribution set, you can use a Web browser to read the Handbook and FAQ locally. In particular, note that the Handbook contains a step-by-step guide to installing &os;.</para> <para>A number of on-line books and articles, also maintained by - the &os; Project, cover more-specialized, &os;-related topics. - This material spans a wide range of topics, from effective use - of the mailing lists, to dual-booting &os; with other - operating systems, to guidelines for new committers. Like the - Handbook and FAQ, these documents are available from the &os; - Documentation Page or in the <filename>doc</filename> - distribution set.</para> + the &os; Project, cover more-specialized, &os;-related topics. + This material spans a wide range of topics, from effective use + of the mailing lists, to dual-booting &os; with other + operating systems, to guidelines for new committers. Like the + Handbook and FAQ, these documents are available from the &os; + Documentation Page or in the <filename>doc</filename> + distribution set.</para> <para>A listing of other books and documents about &os; can be - found in the <link xlink:href="&url.books.handbook;/bibliography.html">bibliography</link> - of the &os; Handbook. Because of &os;'s strong &unix; heritage, - many other articles and books written for &unix; systems are - applicable as well, some of which are also listed in the - bibliography.</para> + found in the <link + xlink:href="&url.books.handbook;/bibliography.html">bibliography</link> + of the &os; Handbook. Because of &os;'s strong &unix; + heritage, many other articles and books written for &unix; + systems are applicable as well, some of which are also listed + in the bibliography.</para> </sect2> </sect1> @@ -399,10 +427,11 @@ <para>&os; represents the cumulative work of many hundreds, if not thousands, of individuals from around the world who have worked - countless hours to bring about this &release.type;. For a - complete list of &os; developers and contributors, please see - <link xlink:href="&url.articles.contributors;/"><quote>Contributors - to &os;</quote></link> on the &os; Web site or any of its + countless hours to bring about this &release.type;. For + a complete list of &os; developers and contributors, please see + <link + xlink:href="&url.articles.contributors;/"><quote>Contributors + to &os;</quote></link> on the &os; Web site or any of its mirrors.</para> <para>Special thanks also go to the many thousands of &os; users diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml index 488cd1a..6332038 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.xml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml @@ -159,8 +159,8 @@ <sect2 xml:id="userland-config"> <title>Userland Configuration Changes</title> - <para revision="313203">The &man.inetd.8; utility can now be - built without <literal>libwrap</literal> support when + <para revision="313203">The &man.inetd.8; utility is now built + without <literal>libwrap</literal> support when <literal>WITHOUT_TCP_WRAPPERS</literal> is set in &man.src.conf.5;.</para> @@ -174,11 +174,29 @@ <literal>WITH_LLD_AS_LD</literal> build knob has been added, which installs <application>LLD</application> as <filename>/usr/bin/ld</filename> if set.</para> + + <para revision="318472" contrib="sponsor" sponsor="&ff;"> + <application>LLD</application> has been enabled by default and + installed as <filename>/usr/bin/ld</filename> on + &os;/&arch.arm64;.</para> + + <para revision="319244">The + <literal>WITH_RPCBIND_WARMSTART_SUPPORT</literal> + &man.src.conf.5; knob has been added, which when enabled + allows building &man.rpcbind.8; with + <literal>warmstart</literal> support.</para> </sect2> <sect2 xml:id="userland-programs"> <title>Userland Application Changes</title> + <para revision="305476" contrib="sponsor" + sponsor="&ff;">Support for &man.blacklistd.8; has been added + to <application>OpenSSH</application>.</para> + + <para revision="306213">The &man.bspatch.1; utility has been + updated with &man.capsicum.4; support.</para> + <para revision="308720" contrib="sponsor" sponsor="&gandi;">The &man.cron.8; utility has been updated to add support for including files within <filename @@ -190,22 +208,22 @@ &man.syslogd.8; utility has been updated to add the <literal>include</literal> keyword which allows specifying a directory containing configuration files to be included in - addition to &man.syslogd.8;. The default &man.syslogd.8; has - been updated to include <filename + addition to &man.syslog.conf.5;. The default + &man.syslog.conf.5; has been updated to include <filename class="directory">/etc/syslog.d</filename> and <filename class="directory">/usr/local/etc/syslog.d</filename> by default.</para> <para revision="308914">The &man.zfsbootcfg.8; utility has been - added, providing one-time &man.nextboot.8; options for - &man.zfsboot.8;.</para> + added, providing one-time &man.boot.config.5;-style options + for &man.zfsboot.8;.</para> <para revision="315514" contrib="sponsor" sponsor="&yandex;">The &man.setkey.8; utility has been modified to show the runtime <acronym>NAT-T</acronym> configuration. The <literal>-g</literal> and <literal>-t</literal> flags have been added, which list only global and virtual policies, - respectively when used with the <literal>-D</literal> and + respectively, when used with the <literal>-D</literal> and <literal>-P</literal> flags.</para> <para revision="316098" contrib="sponsor" @@ -220,15 +238,52 @@ <para revision="317855">The &man.daemon.8; utility has been updated to allow redirecting &man.stdout.4; and &man.stderr.4; - output to &man.syslog.3; and to a file.</para> + output to &man.syslog.3; or to a file.</para> + + <para revision="318576" contrib="sponsor" sponsor="&ff;">The + &man.efivar.8; utility has been added, providing an interface + to manage <acronym>UEFI</acronym> variables.</para> + + <para revision="319388">The &man.cxgbetool.8; utility has been + added, providing command-line access to features and debugging + facilities of &man.cxgbe.4; devices.</para> + + <para revision="320218">The &man.primes.6; utility now + enumerates primes beyond + <literal>3825123056546413050</literal>, up to a new limit of + <literal>2^64 - 1</literal>.</para> </sect2> <sect2 xml:id="userland-contrib"> <title>Contributed Software</title> + <para revision="305837">&man.readelf.1; has been updated to + report &arch.arm; program and section header types.</para> + + <para revision="305844" contrib="sponsor" sponsor="&ff;">The + <acronym>ELF</acronym> Tool Chain has been updated to upstream + revision r3490.</para> + + <para revision="307631">&man.groff.1; has been updated to use + the changelog date rather than file modification date in + manual pages for build reproducibility.</para> + + <note> + <para>&man.groff.1; is planned to be deprecated effective &os; + 12.0-RELEASE.</para> + </note> + <para revision="307729">&man.unbound.8; has been updated to version 1.5.10.</para> + <para revision="309125">&man.strings.1; has been updated to fix + the exit status when multiple files are provided as arguments, + and an error is encountered before the last file.</para> + + <para revision="309183" contrib="sponsor" + sponsor="&ff;">&man.makewhatis.1; has been updated to produce + build-reproducible output.</para> + <para revision="309511"><application>Subversion</application> has been updated to version 1.9.5.</para> @@ -298,12 +353,36 @@ <para revision="316957">&man.tcsh.1; has been updated to version 6.20.00.</para> + + <para revision="318239" contrib="sponsor" + sponsor="&ff;">&man.blacklistd.8; has been updated to the + 20170503 snapshot.</para> + + <para revision="318402" contrib="sponsor" + sponsor="&ff;">&man.blacklistd.8; support for + <application>OpenSSH</application> has been refined to adjust + notification points to catch all authentication failures + rather than only those caused by invalid login + usernames.</para> + + <para revision="319349">&man.byacc.1; has been updated to + version 20170201.</para> + + <para revision="319884"><application>bmake</application> has + been updated to version 20170510.</para> </sect2> <sect2 xml:id="userland-installer"> <title>Installation and Configuration Tools</title> - <para> </para> + <para revision="311686">The installer, &man.bsdinstall.8;, has + been updated to include support for hidden wireless networks + when configuring the &man.wlan.4; interface.</para> + + <para revision="320088" contrib="sponsor" sponsor="&ff;">The + default <acronym>EFI</acronym> partition created by + &man.bsdinstall.8; has been increased from 800KB to + 200MB.</para> </sect2> <sect2 xml:id="userland-rc"> @@ -312,14 +391,22 @@ <para revision="310009" contrib="sponsor" sponsor="&fisglobal;">The <literal>jail_confwarn</literal> - &man.rc.conf.5; entry has been added, which suppresses warning - about obsolete per-&man.jail.8; configurations.</para> + &man.rc.conf.5; entry has been added, which suppresses + warnings about obsolete per-&man.jail.8; + configurations.</para> </sect2> <sect2 xml:id="userland-periodic"> <title><filename class="directory">/etc/periodic</filename> Scripts</title> + <para revision="317373">The default &man.periodic.conf.5; has + been updated to include the + <literal>anticongestion_sleeptime</literal> option, + consolidating random sleeps in &man.periodic.8; scripts and + replacing the <literal>daily_ntpd_avoid_congestion</literal> + option. The default value is 3600 seconds.</para> + <para revision="317857">The <filename>410.status-mfi</filename> &man.periodic.8; script has been added to monitor the status of &man.mfi.4; volumes.</para> @@ -328,16 +415,35 @@ <sect2 xml:id="userland-libraries"> <title>Runtime Libraries and API</title> + <para revision="310372">The <literal>libmd</literal> library has + been updated to introduce functions that operate on &man.fd.4; + instead of <literal>filename</literal>.</para> + + <para revision="316039">The &man.kvm.close.3; function has been + updated to return the accumulated error from previous + &man.close.2; calls.</para> + + <para revision="316613">The C standard library has been updated + to make use of &man.reallocarray.3; for bounds + checking.</para> + <para revision="317618" contrib="sponsor" sponsor="&dellemc;">The <function>clock_nanosleep()</function> system call has been added. The <function>nanosleep()</function> system call is now a wrapper around <function>clock_nanosleep()</function>.</para> + + <para revision="318121">The system libraries have been updated + to make use of &man.reallocarray.3; for bounds + checking.</para> </sect2> <sect2 xml:id="userland-abi"> <title>ABI Compatibility</title> + <para revision="309258">The type <literal>max_align_t</literal> + is now defined for C11 compliance.</para> + <para revision="315274" contrib="sponsor" sponsor="&dellemc;">The <function>sem_clockwait_np()</function> library function has @@ -345,8 +451,25 @@ clock and choose between absolute and relative mode.</para> <para revision="315282">The <application>clang</application> - <literal>nullability</literal> attribute has been added to the - <literal>C</literal> library headers.</para> + <literal>nullability</literal> qualifiers have been added to + the <literal>C</literal> library headers.</para> + + <para revision="315282">Uses of the <acronym>GNU</acronym> + <literal>__nonnull__</literal> attribute have been replaced + with the more benign <application>Clang</application> + nullability attributes.</para> + </sect2> + + <sect2 xml:id="userland-debug"> + <title>Userland Debugging</title> + + <para revision="304499">&man.ptrace.2; now supports events for + &man.vfork.2;, permitting reliable debugging across + &man.vfork.2; invocations.</para> + + <para revision="306786">Process core dumps now include the + process ID (<acronym>PID</acronym>) and command line + arguments.</para> </sect2> </sect1> @@ -357,40 +480,74 @@ tuning, and system control parameters that are not otherwise categorized.</para> + <sect2 xml:id="kernel-general"> + <title>General Kernel Changes</title> + + <para revision="305514">The &man.getdtablesize.2; system call is + now permitted in capability mode.</para> + + <para revision="305516">The <literal>kern.proc.nfds</literal> + &man.sysctl.8; is now permitted in capability mode.</para> + + <para revision="312249">The + <filename>sys/conf/newvers.sh</filename> script has been + updated with an option to exclude build-specific metadata from + the kernel for build reproducibility.</para> + </sect2> + <sect2 xml:id="kernel-bugfix"> <title>Kernel Bug Fixes</title> - <para revision="316039">The &man.kvm.close.3; function has been - updated to return the accumulated error from previous - &man.close.2; calls.</para> - <para revision="317434">The &man.ipf.4; packet filter has been - updated to prevent "keep state" from incorrectly - implying "keep frags", matching the behavior - documented in &man.ipf.5;.</para> + updated to prevent <literal>keep state</literal> from + incorrectly implying <literal>keep frags</literal>, matching + the behavior documented in &man.ipf.5;.</para> </sect2> <sect2 xml:id="kernel-config"> <title>Kernel Configuration</title> - <para revision="315514" contrib="sponsor" sponsor="&yandex;">The - <literal>IPSEC_NAT_T</literal> kernel configuration option has - been removed. Support for <acronym>NAT-T</acronym> is now - enabled by default.</para> + <para revision="312730">The + <literal>WITH_REPRODUCIBLE_BUILD</literal> &man.src.conf.5; + knob has been added, which when set, excludes build-specific + metadata from the kernel, for build reproducibility.</para> + + <para revision="315514" contrib="sponsor" + sponsor="&yandex;">Support for <acronym>NAT-T</acronym> is now + enabled by default. The <literal>IPSEC_NAT_T</literal> kernel + configuration option has been removed.</para> <para revision="315514" contrib="sponsor" sponsor="&yandex;">The <literal>IPSEC_FILTERTUNNEL</literal> kernel option has been removed, which was deprecated by the <literal>net.inet.ipsec.filtertunnel</literal> sysctl.</para> + + <para revision="318763">The <literal>EARLY_AP_STARTUP</literal> + option has been enabled by default on &arch.amd64; and + &arch.i386; architectures, which when enabled releases + Application Processors (<acronym>AP</acronym>s) earlier in the + kernel startup process.</para> </sect2> <sect2 xml:id="kernel-modules"> <title>Kernel Modules</title> + <para revision="307144">&man.cloudabi.4; has been updated to + allow running 32-bit binaries within 64-bit userland + environments when the kernel configuration file has the + <literal>COMPAT_CLOUDABI32</literal> option present.</para> + <para revision="315514" contrib="sponsor" sponsor="&yandex;">The <literal>ipsec</literal> and <literal>tcpmd5</literal> kernel modules have been added.</para> + <note> + <para>Following the addition of the <literal>tcpmd5</literal> + module, it is now necessary to have a security association + (<acronym>SA</acronym>) entry for both inbound and outbound + directions.</para> + </note> + <para revision="316274" contrib="sponsor" sponsor="&yandex;">The &man.ipfw.4; packet filter has been updated to add support for named dynamic states.</para> @@ -460,28 +617,111 @@ <para revision="308942">The &man.bytgpio.4; driver has been added, providing support for Intel® Bay Trail™ SoC GPIO controllers.</para> + + <para revision="312394"><filename>/dev/kmem</filename> no longer + supports access via <function>mmap()</function>. Consumers + wishing to use <filename>/dev/kmem</filename> must use + <function>read()</function> and + <function>write()</function>.</para> + + <para revision="306533" contrib="sponsor" + sponsor="&chelsio;">&man.devctl.8; now supports a "clear + driver" command as a complement to "set + driver".</para> </sect2> <sect2 xml:id="drivers-storage"> <title>Storage Drivers</title> - <para> </para> + <para revision="319435">The &man.mpr.4; driver has been updated + to support tri-mode + (<acronym>SAS</acronym>/<acronym>SATA</acronym>/<acronym>PCIe</acronym>) + Broadcom® storage adapters.</para> </sect2> <sect2 xml:id="drivers-network"> <title>Network Drivers</title> + <para revision="306660" contrib="sponsor" + sponsor="&chelsio;">The &man.cxgbe.4; driver has been updated + to provide support for Virtual Function devices + (<acronym>VFs</acronym>) on Chelsio T4 and T5 adapters.</para> + + <para revision="306661" contrib="sponsor" + sponsor="&chelsio;">TCP connections using the TCP Offload + Engine (<acronym>TOE</acronym>) on Chelsio T4+ adapters can + now perform zero-copy sends via + <function>aio_write()</function>.</para> + + <para revision="306664" contrib="sponsor" + sponsor="&chelsio;">The &man.cxgbev.4; driver has been added, + providing support for Virtual Function devices + (<acronym>VFs</acronym>) on Chelsio T4 and T5 adapters.</para> + <para revision="309377" contrib="sponsor" sponsor="&broadcom;">The &man.bnxt.4; driver has been added, providing support for Broadcom® NetXtreme-C™ and NetXtreme-E™ devices.</para> + <para revision="309560" contrib="sponsor" + sponsor="&chelsio;">The &man.cxgbe.4; driver now supports + devices using T6-based adapters which support 10, 25, 40, and + 100 Gbps.</para> + + <para revision="309560" contrib="sponsor" + sponsor="&chelsio;">The &man.cxgbe.4; driver has been updated + to provide support for Virtual Function devices + (<acronym>VFs</acronym>) on Chelsio T6 adapters.</para> + + <para revision="309560" contrib="sponsor" + sponsor="&chelsio;">The &man.cxgbev.4; driver has been updated + to provide support for Virtual Function devices + (<acronym>VFs</acronym>) on Chelsio T6 adapters.</para> + + <para revision="310852" contrib="sponsor" + sponsor="&netgate;">The &man.miibus.4; driver has been updated + to support Microchip/Micrel KSZ9031 Gigabit ethernet + cards.</para> + + <para revision="312358">The &man.alc.4; driver has been updated + to provide support for Atheros® Killer E2400™ + Gigabit ethernet cards.</para> + + <para revision="314005" contrib="sponsor" sponsor="&ms;">The + &man.alc.4; driver has been updated to provide support for + Atheros® Killer E2500™ Gigabit ethernet + cards.</para> + + <para revision="315330" contrib="sponsor" + sponsor="&netgate;">The &man.etherswitch.4; driver has been + updated to support RTL8366RB and RTL8366SR cards.</para> + + <para revision="315514" contrib="sponsor" sponsor="&yandex;">The + &man.if.ipsec.4; virtual tunneling interface has been added, + implementing route-based <acronym>VPN</acronym>s protected + with Encapsulating Security Payload + (<acronym>ESP</acronym>).</para> + <para revision="317116">The &man.qlnxe.4; driver has been added, providing support for Cavium® Qlogic™ 45000 Series adapters.</para> <para revision="317182">The &man.qlxgbe.4; firmware has been updated to version 5.4.64.</para> + + <para revision="318357" contrib="sponsor" + sponsor="&intelcorp;">The &man.ixl.4; driver has been updated + to version 1.7.12-k.</para> + + <para revision="319269" contrib="sponsor" + sponsor="&chelsio;">The &man.cxgbe.4; driver has been updated + to firmware version 1.16.45.0 for T4, T5, and T6 cards.</para> + + <para revision="320164">The &man.qlnxe.4; driver has been + updated to support QLE41XXX hardware.</para> + + <para revision="320164">The &man.qlnxe.4; driver firmware has + been updated to version 8.30.0.0.</para> </sect2> </sect1> @@ -496,13 +736,49 @@ <sect2 xml:id="hardware-support"> <title>Hardware Support</title> - <para> </para> + <para revision="307576">The &man.atkbdc.4; driver has been + updated to provide support for Elantech® trackpads. To + enable hardware support, add + <literal>hw.psm.elantech_support=1</literal> to + &man.loader.conf.5;.</para> </sect2> <sect2 xml:id="hardware-virtualization"> <title>Virtualization Support</title> - <para> </para> + <para revision="306471" contrib="sponsor" + sponsor="&chelsio;"><acronym>PCI</acronym> passthrough with + &man.bhyve.4; supports more dynamic configurations permitting + devices to be marked for passthrough or host use at + runtime.</para> + + <para revision="306520" contrib="sponsor" + sponsor="&chelsio;"><acronym>PCI</acronym> passthrough with + &man.bhyve.4; resets functions via <acronym>FLR</acronym> when + a virtual machine is started and stopped.</para> + + <para revision="309312" contrib="sponsor" + sponsor="&ms;"><acronym>PCI</acronym> passthrough support has + been enabled on &os; virtual machines running on + Microsoft® Hyper-V™.</para> + + <para revision="314091" contrib="sponsor" sponsor="&ms;">The + &man.hv.netvsc.4; driver <acronym>SR-IOV</acronym> + implementation has been updated to support Virtual Function + (<acronym>VF</acronym>) devices, such as the Mellanox® + Connect-X3™ network card.</para> + + <para revision="316272" contrib="sponsor" sponsor="&ms;">Support + for Microsoft® Hyper-V™ Generation 2 virtual + machines has been added.</para> + + <para revision="317119" contrib="sponsor" sponsor="&ms;">Support + for synthetic keyboards has been added for virtual machines + running on Microsoft® Hyper-V™.</para> + + <para revision="312790">The &os; virtual machines provided on + Amazon® EC2™ now enable <acronym>IPv6</acronym> by + default.</para> </sect2> <sect2 xml:id="hardware-arm"> @@ -528,17 +804,33 @@ <sect2 xml:id="storage-net"> <title>Networked Storage</title> - <para> </para> + <para revision="318660">The <acronym>NFS</acronym> client now + properly handles <literal>NFS4ERR_BAD_SESSION</literal> errors + received from an <acronym>NFS</acronym> server. Additionally, + the kernel <acronym>RPC</acronym> client has been updated to + prevent creating new <acronym>TCP</acronym> connections when + <literal>ERESTART</literal> is received from + &man.sosend.9;.</para> + + <para revision="318660">The <acronym>NFS</acronym> client now + supports the Amazon® Elastic File System™ + (<acronym>EFS</acronym>).</para> </sect2> <sect2 xml:id="storage-zfs"> <title>ZFS</title> - <para> </para> + <para revision="318785">The + <literal>vfs.zfs.debug_flags</literal> &man.sysctl.8; has been + deprecated in favor of + <literal>vfs.zfs.debugflags</literal>. Additionally, + <literal>vfs.zfs.debugflags</literal> can now be configured in + &man.loader.conf.5;, whereas + <literal>vfs.zfs.debug_flags</literal> could not.</para> </sect2> <sect2 xml:id="storage-geom"> - <title>&man.geom.4;</title> + <title><literal>geom(4)</literal></title> <para> </para> </sect2> @@ -553,6 +845,10 @@ <sect2 xml:id="boot-loader"> <title>Boot Loader Changes</title> + <para revision="305845" contrib="sponsor" sponsor="&ff;">The + <acronym>UEFI</acronym> boot loader has been updated for build + reproducibility.</para> + <para revision="307632" contrib="sponsor" sponsor="&gandi;">The <acronym>EFI</acronym> loader has been updated to support <acronym>TFTPFS</acronym>, providing netboot support without @@ -584,9 +880,9 @@ sponsor="&dellemc;">The network stack has been modified to fix incorrect or invalid <acronym>IP</acronym> addresses if multiple threads emit a <acronym>UDP</acronym> - <literal>log_in_vein</literal> message concurrently.</para> + <literal>log_in_vain</literal> message concurrently.</para> - <para revision="317386" contrib="sponsor" + <para revision="317368" contrib="sponsor" sponsor="&multiplay;">The <acronym>TCP</acronym> stack has been changed to use the estimated <acronym>RTT</acronym> instead of timestamps for receive buffer auto resizing.</para> @@ -597,7 +893,8 @@ <para revision="309337" contrib="sponsor" sponsor="&dellemc;">Support for <acronym>GARP</acronym> - retransmit has been added. A new &man.sysctl.8;, + (gratuitous <acronym>ARP</acronym>) retransmit has been added. + A new &man.sysctl.8;, <literal>net.link.ether.inet.garp_rexmit_count</literal>, has been added, which sets the maximum number of retransmissions when set to a non-zero value.</para> diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml index 72828c5..2dcf9fd 100644 --- a/release/doc/share/xml/security.xml +++ b/release/doc/share/xml/security.xml @@ -90,6 +90,14 @@ <entry>27 April 2017</entry> <entry><para>Fix fragment handling panic</para></entry> </row> + + <row> + <entry><link + xlink:href="&security.url;/FreeBSD-SA-17:05.heimdal.asc">FreeBSD-SA-17:05.heimdal</link></entry> + <entry>12 July 2017</entry> + <entry><para>Fix KDC-REP service name validation + vulnerability</para></entry> + </row> </tbody> </tgroup> </informaltable> diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent index 76919b6..75ad353 100644 --- a/release/doc/share/xml/sponsor.ent +++ b/release/doc/share/xml/sponsor.ent @@ -40,12 +40,13 @@ <!ENTITY limelight "Limelight Networks"> <!ENTITY lsi "LSI"> +<!ENTITY ms "Microsoft"> <!ENTITY msostc "Microsoft Open Source Technology Center"> <!ENTITY mitail "MIT Computer Science & Artificial Intelligence Laboratory"> <!ENTITY multiplay "Multiplay"> <!ENTITY netflix "Netflix"> -<!ENTITY netgate "Netgate"> +<!ENTITY netgate "Rubicon Communications, LLC (Netgate)"> <!ENTITY nginx "Nginx, Inc."> <!ENTITY norse "Norse Corporation"> diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 40faed8..c027141 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -40,6 +40,13 @@ hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities +jail-debug_DESCR= Debugging Symbols +jail-development_DESCR=Development Files +jail-profile_DESCR= Profiling Libraries +jail-lib32_DESCR= 32-bit Libraries +jail-lib32-debug_DESCR=32-bit Debugging Symbols +jail-lib32-development_DESCR=32-bit Development Files +jail-lib32-profile_DESCR=32-bit Profiling Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel manuals_COMMENT= Manual Pages diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 9a963f0..5d7e7f6 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -48,6 +48,12 @@ main() { pkgdeps="runtime" _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)" ;; + jail_*) + outname="${origname}" + uclfile="${outname##*}${uclfile}" + pkgdeps="runtime" + _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)" + ;; *_lib32_development) outname="${outname%%_lib32_development}" _descr="32-bit Libraries, Development Files" diff --git a/release/packages/jail-debug.ucl b/release/packages/jail-debug.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-debug.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail-development.ucl b/release/packages/jail-development.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-development.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail-lib32-debug.ucl b/release/packages/jail-lib32-debug.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-lib32-debug.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail-lib32-development.ucl b/release/packages/jail-lib32-development.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-lib32-development.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail-lib32-profile.ucl b/release/packages/jail-lib32-profile.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-lib32-profile.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail-lib32.ucl b/release/packages/jail-lib32.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-lib32.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail-profile.ucl b/release/packages/jail-profile.ucl new file mode 100644 index 0000000..753c26b --- /dev/null +++ b/release/packages/jail-profile.ucl @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD +deps: { + FreeBSD-%PKGDEPS%: { + origin: "base", + version: "%VERSION%" + } +} + diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl index 753c26b..53abd14 100644 --- a/release/packages/jail.ucl +++ b/release/packages/jail.ucl @@ -10,6 +10,7 @@ categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" prefix = "/" +vital = true licenselogic = "single" licenses = [ BSD2CLAUSE ] desc = <<EOD diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl index 13e4492..f55f1c8 100644 --- a/release/packages/runtime.ucl +++ b/release/packages/runtime.ucl @@ -10,7 +10,7 @@ categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" prefix = "/" -#vital = true +vital = true licenselogic = "single" licenses = [ BSD2CLAUSE ] desc = <<EOD diff --git a/release/scripts/atlas-upload.sh b/release/scripts/atlas-upload.sh index bf1dbf1..f7c40b4 100755 --- a/release/scripts/atlas-upload.sh +++ b/release/scripts/atlas-upload.sh @@ -27,7 +27,7 @@ # ATLAS_API_URL='' -ATLAS_UPLOAD_URL='https://binstore.hashicorp.com' +ATLAS_UPLOAD_URL='https://app.vagrantup.com' DESCRIPTION="FreeBSD Snapshot Build" usage() { @@ -76,7 +76,7 @@ main () { fi # Check to see if the box exists or create it - BOXRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}?access_token=${KEY}") + BOXRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}?access_token=${KEY}") if [ $? != 0 ]; then echo "Failed to connect to the API" exit 2; @@ -84,26 +84,26 @@ main () { echo $BOXRESULT | grep "\"name\":\"${BOX}\"" > /dev/null if [ $? != 0 ]; then echo "Creating box: ${BOX}" - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/boxes -X POST -d "box[name]=${BOX}" -d "access_token=${KEY}" > /dev/null - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX} -X PUT -d "box[is_private]=false" -d "access_token=${KEY}" > /dev/null - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX} -X PUT -d "box[description]='${DESCRIPTION}'" -d "access_token=${KEY}" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/boxes -X POST -d "box[name]=${BOX}" -d "access_token=${KEY}" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX} -X PUT -d "box[is_private]=false" -d "access_token=${KEY}" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX} -X PUT -d "box[description]='${DESCRIPTION}'" -d "access_token=${KEY}" > /dev/null else echo "Box already exists" fi # Check to see if the version exists or create it - VERSIONRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}?access_token=${KEY}") + VERSIONRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}?access_token=${KEY}") if [ $? != 0 ]; then echo "Failed to connect to the API" exit 2; fi - echo $VERSIONRESULT | grep "\"version\":\"${VERSION}\"" > /dev/null + echo $VERSIONRESULT | grep "version/${VERSION}" > /dev/null if [ $? != 0 ]; then echo "Creating version: ${VERSION}" - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/versions -X POST -d "version[version]=${VERSION}" -d "access_token=${KEY}" > /dev/null - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION} -X PUT -d "version[description]=${DESCRIPTION}" -d "access_token=${KEY}" > /dev/null - VERSIONRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}?access_token=${KEY}") - echo $VERSIONRESULT | grep "\"version\":\"${VERSION}\"" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/versions -X POST -d "version[version]=${VERSION}" -d "access_token=${KEY}" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION} -X PUT -d "version[description]=${DESCRIPTION}" -d "access_token=${KEY}" > /dev/null + VERSIONRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}?access_token=${KEY}") + echo $VERSIONRESULT | grep "version/${VERSION}" > /dev/null if [ $? != 0 ]; then echo "Failed to create version" exit 2 @@ -113,46 +113,46 @@ main () { fi # Check to see if the provider exists or create it - PROVIDERRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}") + PROVIDERRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}") if [ $? != 0 ]; then echo "Failed to connect to the API" exit 2; fi - echo $PROVIDERRESULT | grep "\"name\":\"${PROVIDER}\"" > /dev/null + echo $PROVIDERRESULT | grep "provider/${PROVIDER}" > /dev/null if [ $? != 0 ]; then echo "Creating provider: ${PROVIDER}" - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/providers -X POST -d "provider[name]=${PROVIDER}" -d "access_token=${KEY}" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/providers -X POST -d "provider[name]=${PROVIDER}" -d "access_token=${KEY}" > /dev/null else echo "Provider already exists" fi # Request an upload token - TOKENRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}/upload?access_token=${KEY}") + TOKENRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}/upload?access_token=${KEY}") if [ $? != 0 ]; then echo "Failed to get the token from the API" exit 2; fi - echo ${TOKENRESULT} | grep "\"token\":" > /dev/null + echo ${TOKENRESULT} | grep -E "upload_path" > /dev/null if [ $? != 0 ]; then echo "No token found from the API" exit 2 else - TOKEN=$(echo $TOKENRESULT | sed -e 's/.*token":"//' -e 's/".*//') + TOKEN=$(echo $TOKENRESULT | sed -e 's/.*token":"//' -e 's/.*upload_path":"//' -e 's/}$//g' -e 's/"//g') echo "Uploading to Atlas" - UPLOADRESULT=$(/usr/local/bin/curl -s -X PUT --upload-file ${FILE} ${ATLAS_UPLOAD_URL}/${TOKEN}) + UPLOADRESULT=$(/usr/local/bin/curl -s -X PUT --upload-file ${FILE} "${TOKEN}") # Validate the Upload echo "Validating" - VALIDRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}") - HOSTED_TOKEN=$(echo $VALIDRESULT | sed -e 's/.*hosted_token":"//' -e 's/".*//') - if [ ! -z ${HOSTED_TOKEN} -a ! -z ${TOKEN} -a ${HOSTED_TOKEN} != ${TOKEN} ]; then + VALIDRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}") + HOSTED_TOKEN=$(echo $VALIDRESULT | sed -e 's/.*"hosted"://' -e 's/,.*$//') + if [ ! -z ${TOKEN} -a "${HOSTED_TOKEN}" != "true" ]; then echo "Upload failed, try again." exit 2 fi # Release the version echo "Releasing ${VERSION} of ${BOX} in Atlas" - /usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/release -X PUT -d "access_token=${KEY}" > /dev/null + /usr/local/bin/curl -s ${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/release -X PUT -d "access_token=${KEY}" > /dev/null fi } diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 7b46230..fe4ffd9 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -10,6 +10,7 @@ export PKG_DBDIR="/tmp/pkg" export PERMISSIVE="YES" export REPO_AUTOUPDATE="NO" export PKGCMD="/usr/sbin/pkg -d" +export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip devel/subversion @@ -24,6 +25,7 @@ shells/bash shells/zsh security/sudo sysutils/screen +sysutils/tmux www/firefox www/links x11-drivers/xf86-video-vmware @@ -32,8 +34,8 @@ x11/kde4 x11/xorg" # If NOPORTS is set for the release, do not attempt to build pkg(8). -if [ ! -f /usr/ports/Makefile ]; then - echo "*** /usr/ports is missing! ***" +if [ ! -f ${PORTSDIR}/Makefile ]; then + echo "*** ${PORTSDIR} is missing! ***" echo "*** Skipping pkg-stage.sh ***" echo "*** Unset NOPORTS to fix this ***" exit 0 @@ -41,7 +43,7 @@ fi if [ ! -x /usr/local/sbin/pkg ]; then /etc/rc.d/ldconfig restart - /usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean + /usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean fi export DVD_DIR="dvd/packages" @@ -57,7 +59,7 @@ fi # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the # final list. for _P in ${_DVD_PACKAGES}; do - if [ -d "/usr/ports/${_P}" ]; then + if [ -d "${PORTSDIR}/${_P}" ]; then DVD_PACKAGES="${DVD_PACKAGES} ${_P}" else echo "*** Skipping nonexistent port: ${_P}" diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 85714c3..4a7a1e8 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -32,7 +32,8 @@ vm_extra_pre_umount() { # catalogue and install or update pkg when the instance first # launches, so these files would just be replaced anyway; removing # them from the image allows it to boot faster. - env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg delete -f -y pkg rm ${DESTDIR}/var/db/pkg/repo-*.sqlite # The size of the EC2 root disk can be configured at instance launch @@ -77,6 +78,9 @@ vm_extra_pre_umount() { # nodes, but apply the workaround just in case. echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf + # Load the kernel module for the Amazon "Elastic Network Adapter" + echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf + # The first time the AMI boots, the installed "first boot" scripts # should be allowed to run: # * ec2_configinit (download and process EC2 user-data) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 10619af..fe937de 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -11,7 +11,7 @@ trap "cleanup" INT QUIT TRAP ABRT TERM write_partition_layout() { if [ -z "${NOSWAP}" ]; then - SWAPOPT="-p freebsd-swap/swapfs::1G" + SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}" fi _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)" @@ -157,6 +157,11 @@ vm_extra_enable_services() { done fi + if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then + echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> \ + ${DESTDIR}/etc/rc.conf + fi + return 0 } |
