#
267654 |
|
19-Jun-2014 |
gjb |
Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
264441 |
|
14-Apr-2014 |
gjb |
MFC r264343: Add SRC_UPDATE_SKIP, DOC_UPDATE_SKIP, and PORTS_UPDATE_SKIP variables. These are intended to allow bypassing the 'svn co /usr/{src,doc,ports}' step in the chroot when the tree exists from external means.
The use case here is that /usr/src, /usr/doc, and /usr/ports in the chroot exist as result of zfs dataset clones, so it is possible (and happens quite often) that the included distributions may not be consistent. (This is not the case for -RELEASE builds, but does happen for snapshot builds.)
Sponsored by: The FreeBSD Foundation
|
#
264246 |
|
07-Apr-2014 |
gjb |
MFC r264027, r264028, r264029, r264030, r264046, r264073:
r264027: Add a new release build variable, WITH_COMPRESSED_IMAGES.
When set to a non-empty value, the installation medium is compressed as part of the 'install' target in the release/ directory.
r264028: Clean up trailing whitespace in release/Makefile.
r264029: Fix logic error.
r264030: If WITH_COMPRESSED_IMAGES is set, add the compressed images to the CLEANFILES list.
r264046: Use xz(1) instead of gzip(1) to compress release images when WITH_COMPRESSED_IMAGES is used.
r264073: Allow overriding xz(1) path.
Sponsored by: The FreeBSD Foundation
|
#
264141 |
|
04-Apr-2014 |
gjb |
MFC r262810, r262862, r264105, r264107:
r262810: Merge enabling building FreeBSD/arm images as part of the release build process.
r262862: Provide backwards-compatibility with release.conf SVNROOT entries that do not have a trailing '/'.
r264105: Add ZEDBOARD support for release builds.
r264107: Remove only-works-on-amd64 restriction.
* Local modifications to stable/9: - Set SRCBRANCH from head/ to stable/9/.
Sponsored by: The FreeBSD Foundation
|
#
262762 |
|
04-Mar-2014 |
gjb |
MFC r262499, r262505, r262507, r262509:
r262499: release.sh: - Add a VCSCMD variable that defaults to 'svn checkout', and update places 'svn co' is used directly. - After sourcing a configuration file, prefix SRCBRANCH, PORTBRANCH, and DOCBRANCH with the SVNROOT. - Properly capitalize 'FreeBSD.org' in the default SVNROOT. - Update Copyright.
release.conf.sample: - Add an example to use git instead of svn, by nullifying SVNROOT, and setting SRCBRANCH, DOCBRANCH, and PORTBRANCH to the URL fo a git repository.
release.7: - Document VCSCMD.
r262505: In release/Makefile, remove exclusion of CVS directories in the src/ and ports/ distributions.
While I am thinking about it, exclude .git directories for src/ and ports/, as somewhat of a followup to r262499.
r262507: Chase r262505, and remove CVS exclusion from picobsd builds.
r262509: Rework how WORLD_FLAGS and KERNEL_FLAGS are set, to remove an unnecessary expr(1) call.
Sponsored by: The FreeBSD Foundation
|
#
260072 |
|
30-Dec-2013 |
gjb |
MFC r254293, r259868, r259881, 259955:
r254293: - Only set ARCH_FLAGS (TARGET/TARGET_ARCH) if specified, otherwise allow the toolchain to detect the correct values.
- Remove {SRC,DOC,PORT}REVISION variables, and use 'branch@rNNNNNN' as the {SRC,DOC,PORT}BRANCH variables.
- Only set default KERNEL_FLAGS and WORLD_FLAGS make(1) jobs if the number of CPUs is greater than 1.
r259868 (jmmv): Delay copying of resolv.conf into the chroot until /etc exists.
r259881 (jmmv): Put the release objdir inside the chroot.
259955: Move build_doc_ports() to the if...fi block from which it is called.
Sponsored by: The FreeBSD Foundation
|
#
259954 |
|
27-Dec-2013 |
gjb |
MFC r254298: Remove get_rev_branch(), functionality exists in the release/Makefile.
Sponsored by: The FreeBSD Foundation
|
#
259530 |
|
17-Dec-2013 |
gjb |
MFC r254224, r254294, r254328, r258307, r258309, r258310, r258314, r258317, r258319, r258320, r258669, r258786, r258853, r258949, r259079, r259246:
r254224: Update the wrapper script to 'release.sh', as used by the FreeBSD Release Engineering Team as of 9.2-RELEASE.
Document that a cross-build release is possible by setting the TARGET and TARGET_ARCH variables.
Include an example of using release.sh with and without the optional configuration file.
Document the supported release.sh configuration file variables.
Update the 'cdrom' target output file to disc1.iso.
Update the 'memstick' target output file to memstick.img.
Add attributions for the last major updates to this manual page.
Fix some mdoc(7) style nits.
r254294: Remove the defaults for TARGET/TARGET_ARCH.
Note that WORLD_FLAGS and KERNEL_FLAGS set the number of make(1) jobs only on SMP-capable systems.
r254328: Remove the {SRC,DOC,PORT}REVISION variables from release(7), and update the default {SRC,DOC,PORT}BRANCH defaults.
r258307: Add a script and configuration files to fetch pre-built packages from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).
The script sources ${.CURDIR}/${TARGET}/pkg-stage.conf, which sets several environment variables, such as the pkg(8) ABI, PACKAGESITE, PKG_DBDIR, and PKG_CACHEDIR. PKG_CACHEDIR is set to the directory on the release medium used by bsdconfig(8) (/packages/${ABI}). ABI is determined by output of 'make -C /usr/src/release -V REVISION'. See pkg.conf(5) for descripton on other variables set here.
The list of packages to include are set within the configuration file.
The script and configuration files are intended to be run by the 'make dvd' target within the release directory, and assume the release is built within a chroot environment (such as by using release.sh).
r258309: Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/' in preparation of adding a 'dvd1.iso' target.
r258310: Add the 'dvd1.iso' target. This mimics the 'release.iso' target, with the additional step of fetching packages for inclusion on the dvd image.
The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if the '${TARGET}/pkg-stage.conf' configuration file exists (currently only amd64 and i386).
Allow dvd1.iso to be skipped if NODVD=1.
r258314: Fix how ABI is evaluated so it matches more than a dot-zero case.
r258317: Document the 'dvdrom' target.
r258319: Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.
r258320: Simplify PKG_ABI for pkg-stage.sh.
r258669: Document the dvdrom target and NODVD variable.
r258786: Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise the textproc/docproj port build fails.
r258853: Turn off the dvdrom target by default. dvd1.iso is now built by specifying 'WITH_DVD=1' during 'make release'.
r258949: Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating to true.
r259079: Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually passed to 'make release'.
r259246: Prevent release build errors found during snapshot builds where if NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if WITH_DVD=1.
Tested against: stable/9@r259512 Sponsored by: The FreeBSD Foundation
|
#
258313 |
|
18-Nov-2013 |
gjb |
MFC r257942, r258101:
r257942: Fix a few style nits.
r258101: Since the doc/ toolchain conversion to docbook 5.0, JADETEX is no longer a valid option, so remove 'WITHOUT_JADETEX=yes' from PBUILD_FLAGS.
While here, also remove 'WITHOUT_X11=yes', since it will cause a dependency conflict by requiring both print/ghostscript9 and print/ghostscript9-nox11.
Switch to OPTIONSNG format (WITHOUT_* -> OPTIONS_UNSET='FOO'), and unset the FOP option, which requires Java (although it is disabled by default). Also unset the 'IGOR' option, since textproc/igor is a validation tool, not necessarily a dependency of the doc/ build itself.
While here, reduce the line length of PBUILD_FLAGS.
Sponsored by: The FreeBSD Foundation
|
#
257836 |
|
08-Nov-2013 |
gjb |
MFC r257641: When building the textproc/docproj port, the ports-mgmt/pkg port needs /var/run/ld-elf*.so.hints, which is not automatically created.
Fix reldoc build by running the ldconfig(8) startup script in the chroot directory before starting the port build phase.
Sponsored by: The FreeBSD Foundation
|
#
256364 |
|
12-Oct-2013 |
gjb |
MFC r256246: Remove hash generation from release.sh, as it is run as part of the 'install' target in the release/Makefile.
Sponsored by: The FreeBSD Foundation
|
#
255984 |
|
02-Oct-2013 |
gjb |
MFC r255712: Remove extra 'MAKE_FLAGS' line.
|
#
253019 |
|
08-Jul-2013 |
gjb |
MFC r252846:
- Add SRC_FORCE_CHECKOUT configuration option to force svn to checkout the src/ tree into a directory that contains files/directories, such as a case where a custom kernel configuration file is specified.
- Allow specification of multiple KERNCONFs to pass to 'make release'.
- Move evaluation of NODOCS/NOPORTS earlier, and set based on how the release process expects these options to be evaluated.
- Wrap KERNCONF specification in double quotes, and use 'eval' so multiple kernel configurations do not cause the build to fail in strange ways.
- Set WITHOUT_X11 for the port build flags for the documentation toolchain build. Also run 'clean distclean' targets during port build.
PR: 180192 MFC after: 3 days Approved by: kib (mentor, implicit)
|
#
252224 |
|
25-Jun-2013 |
gjb |
MFC r251652, r251811, r252101:
r251652: Add new script to run release builds. The script is heavily based upon the release/generate-release.sh script by nwhitehorn.
This script can use optional configuration file to override defaults, making running multiple serialzied builds with different specific configurations or architecture-specific tunings quite easy.
Sample overrideable options are included in the release.conf.sample file.
r251811: Fix OSVERSION variable within PBUILD_FLAGS.
r252101: If MAKE_CONF and/or SRC_CONF are set and not character devices, copy to chroot to use with release build.
Approved by: kib (mentor, implicit)
|
#
251652 |
|
12-Jun-2013 |
gjb |
Add new script to run release builds. The script is heavily based upon the release/generate-release.sh script by nwhitehorn.
This script can use optional configuration file to override defaults, making running multiple serialzied builds with different specific configurations or architecture-specific tunings quite easy.
Sample overrideable options are included in the release.conf.sample file.
Approved by: kib (mentor) MFC After: 2 weeks X-MFC-To: stable/9 only
|