diff options
author | Glen Barber <gjb@FreeBSD.org> | 2015-02-11 18:59:46 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2015-02-11 18:59:46 +0000 |
commit | 53f2fbcab4ca497c4bed5e5728534468e2b9e992 (patch) | |
tree | 303a2448e6e55aa1910e1ff2c6a77612730d280f /release | |
parent | ccb7bf26233e1b6ef1dcb23ac7206beb53dcaff7 (diff) | |
parent | 399d34850fe953934b6516ac78dfc3c7aed1e10f (diff) | |
download | src-53f2fbcab4ca497c4bed5e5728534468e2b9e992.tar.gz src-53f2fbcab4ca497c4bed5e5728534468e2b9e992.zip |
MFH: r278202,r278205-r278590
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-arm-redux/; revision=278591
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile | 16 | ||||
-rw-r--r-- | release/Makefile.vm | 2 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/errata/article.xml | 12 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.xml | 8 | ||||
-rw-r--r-- | release/doc/share/xml/errata.xml | 28 | ||||
-rw-r--r-- | release/doc/share/xml/release.ent | 9 | ||||
-rw-r--r-- | release/doc/share/xml/security.xml | 28 | ||||
-rwxr-xr-x | release/release.sh | 2 | ||||
-rwxr-xr-x | release/scripts/mk-vmimage.sh | 10 |
9 files changed, 98 insertions, 17 deletions
diff --git a/release/Makefile b/release/Makefile index 4672a91511a8..0a3f50972d15 100644 --- a/release/Makefile +++ b/release/Makefile @@ -33,6 +33,9 @@ # with xz(1) (extremely time consuming) # WITH_CLOUDWARE: if set, build cloud hosting disk images with the release # TARGET/TARGET_ARCH: architecture of built release +# XZ_FLAGS: Additional arguments to pass to xz(1) +# XZ_THREADS: Number of xz(1) threads to use +# NO_XZTHREADS: Disable multi-threaded xz(1) compression # WORLDDIR?= ${.CURDIR}/.. @@ -40,6 +43,8 @@ PORTSDIR?= /usr/ports DOCDIR?= /usr/doc RELNOTES_LANG?= en_US.ISO8859-1 XZCMD?= /usr/bin/xz +XZ_FLAGS?= +XZ_THREADS?= .if !defined(TARGET) || empty(TARGET) TARGET= ${MACHINE} @@ -54,6 +59,15 @@ TARGET_ARCH= ${TARGET} IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DISTDIR= dist +.if !defined(NO_XZTHREADS) && empty(XZ_THREADS) +XZ_THREADS= 0 +.else +XZ_THREADS= ${XZ_THREADS} +.endif +.if !empty(XZ_THREADS) +XZ_FLAGS+= -T ${XZ_THREADS} +.endif + # Define OSRELEASE by using newvars.sh .if !defined(OSRELEASE) || empty(OSRELEASE) .for _V in TYPE BRANCH REVISION @@ -295,7 +309,7 @@ release-install: .for I in ${IMAGES} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I} . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) - ${XZCMD} -k ${DESTDIR}/${OSRELEASE}-${I} + ${XZCMD} ${XZ_FLAGS} -k ${DESTDIR}/${OSRELEASE}-${I} . endif .endfor cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256 diff --git a/release/Makefile.vm b/release/Makefile.vm index fe955d30d8c1..34f31665fbce 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -101,7 +101,7 @@ vm-install: # the DESTDIR. . for FORMAT in ${VMFORMATS} # Don't keep the originals. There is a copy in ${.OBJDIR} if needed. - ${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} + ${XZCMD} ${XZ_FLAGS} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} . endfor . endif cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml index 8fab95d92f16..f78ec3a6dcef 100644 --- a/release/doc/en_US.ISO8859-1/errata/article.xml +++ b/release/doc/en_US.ISO8859-1/errata/article.xml @@ -4,6 +4,8 @@ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "http://www.FreeBSD.org/release/XML/release.ent"> %release; +<!ENTITY security SYSTEM "../../share/xml/security.xml"> +<!ENTITY errata SYSTEM "../../share/xml/errata.xml"> ]> <article xmlns="http://docbook.org/ns/docbook" @@ -17,7 +19,7 @@ <pubdate>$FreeBSD$</pubdate> <copyright> - <year>2014</year> + <year>2015</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> @@ -76,7 +78,13 @@ <sect1 xml:id="security"> <title>Security Advisories</title> - <para>No advisory.</para> + &security; + </sect1> + + <sect1 xml:id="errata"> + <title>Errata Notices</title> + + &errata; </sect1> <sect1 xml:id="open-issues"> diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml index f0992e0f2dea..4fe344cf7e02 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.xml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml @@ -7,6 +7,8 @@ %sponsor; <!ENTITY % vendor PUBLIC "-//FreeBSD//ENTITIES Vendor Specification//EN" "vendor.ent"> %vendor; +<!ENTITY security SYSTEM "../../share/xml/security.xml"> +<!ENTITY errata SYSTEM "../../share/xml/errata.xml"> ]> <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> @@ -138,15 +140,13 @@ <sect2 xml:id="security"> <title>Security Advisories</title> - <para>No advisories.</para> - + &security; </sect2> <sect2 xml:id="errata"> <title>Errata Notices</title> - <para>No errata notices.</para> - + &errata; </sect2> </sect1> diff --git a/release/doc/share/xml/errata.xml b/release/doc/share/xml/errata.xml new file mode 100644 index 000000000000..efc21a1cb7c0 --- /dev/null +++ b/release/doc/share/xml/errata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- + The FreeBSD Documentation Project + + $FreeBSD$ +--> +<informaltable frame="none" pgwide="1"> + <tgroup cols="3"> + <colspec colwidth="40%"/> + <colspec colwidth="30%"/> + <colspec colwidth="30%"/> + <thead> + <row> + <entry>Errata</entry> + <entry>Date</entry> + <entry>Topic</entry> + </row> + </thead> + + <tbody> + <row> + <entry><para>No errata notices.</para></entry> + <entry><para> </para></entry> + <entry><para> </para></entry> + </row> + </tbody> + </tgroup> +</informaltable> diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent index 4e7709ab1304..e02a5f647b27 100644 --- a/release/doc/share/xml/release.ent +++ b/release/doc/share/xml/release.ent @@ -16,7 +16,7 @@ <!-- The previous stable release, useful for pointing user's at the release they SHOULD be running if they don't want the bleeding edge. --> -<!ENTITY release.prev.stable "9.2-RELEASE"> +<!ENTITY release.prev.stable "9.3-RELEASE"> <!-- The next version to be released, usually used for snapshots. --> <!ENTITY release.next "11.0-RELEASE"> @@ -25,7 +25,10 @@ <!ENTITY release.branch "11-CURRENT"> <!-- The URL for obtaining this version of FreeBSD. --> -<!ENTITY release.url "http://www.FreeBSD.org/snapshots/"> +<!ENTITY release.url "https://www.FreeBSD.org/snapshots/"> + +<!-- The URL for Security Advisories and Errata Notices. --> +<!ENTITY security.url "https://www.FreeBSD.org/security/advisories"> <!-- The recommended mailing list to track. --> <!ENTITY release.maillist "current"> @@ -51,7 +54,7 @@ <!ENTITY release ''> <!-- The manpaths for man page references --> -<!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi"> +<!ENTITY release.man.url "https://www.FreeBSD.org/cgi/man.cgi"> <!ENTITY release.manpath.xorg "7.5.1"> <!ENTITY release.manpath.netbsd "5.1"> <!ENTITY release.manpath.freebsd-ports "Ports"> diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml new file mode 100644 index 000000000000..74a8cd7211df --- /dev/null +++ b/release/doc/share/xml/security.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- + The FreeBSD Documentation Project + + $FreeBSD$ +--> +<informaltable frame="none" pgwide="1"> + <tgroup cols="3"> + <colspec colwidth="40%"/> + <colspec colwidth="30%"/> + <colspec colwidth="30%"/> + <thead> + <row> + <entry>Advisory</entry> + <entry>Date</entry> + <entry>Topic</entry> + </row> + </thead> + + <tbody> + <row> + <entry><para>No advisories.</para></entry> + <entry><para> </para></entry> + <entry><para> </para></entry> + </row> + </tbody> + </tgroup> +</informaltable> diff --git a/release/release.sh b/release/release.sh index eca772317fd6..6839e330f72a 100755 --- a/release/release.sh +++ b/release/release.sh @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2013, 2014 The FreeBSD Foundation +# Copyright (c) 2013-2015 The FreeBSD Foundation # Copyright (c) 2013 Glen Barber # Copyright (c) 2011 Nathan Whitehorn # All rights reserved. diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index b6122a5de01f..16c33c8febd6 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2014 The FreeBSD Foundation +# Copyright (c) 2014, 2015 The FreeBSD Foundation # All rights reserved. # # This software was developed by Glen Barber under sponsorship @@ -40,6 +40,7 @@ usage() { main() { local arg + VMCONFIG="/dev/null" while getopts "C:c:d:f:i:o:s:S:" arg; do case "${arg}" in C) @@ -76,10 +77,9 @@ main() { -z "${WORLDDIR}" -o \ -z "${DESTDIR}" -o \ -z "${VMSIZE}" -o \ - -z "${VMIMAGE}" -o \ - -z "${VMCONFIG}" ]; + -z "${VMIMAGE}" ]; then - usage + usage || exit 0 fi if [ -z "${VMBUILDCONF}" ] || [ ! -e "${VMBUILDCONF}" ]; then @@ -89,7 +89,7 @@ main() { . "${VMBUILDCONF}" - if [ ! -z "${VMCONFIG}" ] && [ -e "${VMCONFIG}" ]; then + if [ ! -z "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then . "${VMCONFIG}" fi |