summaryrefslogtreecommitdiffstats
path: root/release/release.sh
Commit message (Collapse)AuthorAgeFilesLines
* Merge the following revisions from ^/projects/release-vmimage:gjb2014-10-021-2/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r272234, r272236, r272262, r272264, r272269, r272271, r272272, r272277, r272279, r272376, r272380, r272381, r272392, r272234, r272412: r272234: Initial commit to include virtual machine images as part of the FreeBSD release builds. This adds a make(1) environment variable requirement, WITH_VMIMAGES, which triggers the virtual machine image targets when not defined to an empty value. Relevant user-driven variables include: o VMFORMATS: The virtual machine image formats to create. Valid formats are provided by running 'mkimg --formats' o VMSIZE: The size of the resulting virtual machine image. Typical compression is roughly 140Mb, regardless of the target size (10GB, 15GB, 20GB, 40GB sizes have been tested with the same result). o VMBASE: The prefix of the virtual machine disk images. The VMBASE make(1) environment variable is suffixed with each format in VMFORMATS for each individual disk image, as well as '.img' for the source UFS filesystem passed to mkimg(1). This also includes a new script, mk-vmimage.sh, based on how the VM images for 10.0-RELEASE, 9.3-RELEASE, and 10.1-RELEASE were created (mk-vmimage.sh in ^/user/gjb/thermite/). With the order in which the stages need to occur, as well as sanity-checking error cases, it makes much more sense to execute a shell script called from make(1), using env(1) to set specific parameters for the target image than it does to do this in make(1) directly. r272236: Use VMBASE in place of a hard-coded filename in the CLEANFILES list. r272262: Remove a 'set -x' that snuck in during testing. r272264: release/Makefile: Connect the virtual machine image build to the release target if WITH_VMIMAGES is set to a non-empty value. release/release.sh: Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS. release/release.conf.sample: Add commented entries for tuning the release build if the WITH_VMIMAGES make(1) environment variable is set to a non-empty value. r272269: release/Makefile: Include .OBJDIR in DESTDIR in the vm-base target. release/release.sh: Provide the full path to mddev. r272271: Fix UFS label for the root filesystem. r272272: Remove comments left in accidentally while testing, so the VM /etc/fstab is actually created. r272277: Remove the UFS label from the root filesystem since it is added by mkimg(1) as a gpt label, consistent with the fstab(5) entry. r272279: Comment cleanup in panic() message when mkimg(1) does not support the requested disk image format. r272376: Separate release/scripts/mk-vmimage.sh to machine-specific scripts, making it possible to mimic the functionality for non-x86 targets. Move echo output if MAKEFLAGS is empty outside of usage(). Remove TARGET/TARGET_ARCH evaluation. r272380: Avoid using env(1) to set values passed to mk-vmimage.sh, and instead pass the values as arguments to the script, making it easier to run this by hand, without 'make release'. Add usage_vm_base() and usage_vm_image() usage helpers. r272381: After evaluating WITH_VMIMAGES is non-empty, ensure the mk-vmimage.sh script exists before running it. r272392: Add WITH_COMPRESSED_VMIMAGES variable, which when set enables xz(1) compression of the virtual machine images. This is intentionally separate to allow more fine-grained tuning over which images are compressed, especially in cases where compressing 20GB sparse images can take hours. r272412: Document the new 'vm-image' target, and associated release.conf variables. r272413: Remove two stray comments added during the initial iterations of testing, no longer needed. MFC after: 5 days X-MFC-10.1: yes Tested on: r272269, r272272, r272279, r272380, r272392 Sponsored by: The FreeBSD Foundation
| * release/Makefile:gjb2014-09-281-1/+1
|/ | | | | | | | | | | | | | | Connect the virtual machine image build to the release target if WITH_VMIMAGES is set to a non-empty value. release/release.sh: Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS. release/release.conf.sample: Add commented entries for tuning the release build if the WITH_VMIMAGES make(1) environment variable is set to a non-empty value. Sponsored by: The FreeBSD Foundation
* Wrap a long line.gjb2014-08-241-1/+2
| | | | | | MFC after: 3 days X-MFC-with: r270417, r270418, r270455 Sponsored by: The FreeBSD Foundation
* Set OSREL and UNAME_r in release/release.sh when buildinggjb2014-08-241-1/+5
| | | | | | | | | ports to prevent ports build failures from killing the release build. MFC after: 3 days X-MFC-with: r270417, r270418 Sponsored by: The FreeBSD Foundation
* Merge the following from ^/projects/release-noxdev:gjb2014-08-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559, r269560, r269561, r269628, r269629, r269630, r269635, r269637: r269549: Create a new project branch, release-noxdev, for a sandbox workspace outside of head/ to update the release bits for arm builds since the deprecation of the XDEV and XDEV_ARCH make(1) variables. r269551: Define load_chroot_env() and load_target_env() prototypes. r269552: Call load_chroot_env() and load_target_env() where they can be mutually conflicting with regard to TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH. r269553: Add shebang line to arm/*.conf files since these should be considered to be executable (albeit not on their own) shell scripts. r269554: Redefine load_chroot_env() and load_target_env() in the arm/*.conf files, and reindent. r269555: Simplify where load_chroot_env() and load_target_env() are called. r269558: Provide example in release.conf.sample for overriding the load_chroot_env() and load_target_env() prototypes. r269559: Remove a gratuitous newline. r269560: Unset potentially conflicting variables in load_chroot_env() and load_target_env(). r269561: Make global variables global, and accessible outside of the functions within which they were once defined. r269628: Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set. r269629: In arm/release.sh, switch TARGET/TARGET_ARCH back to the original XDEV/XDEV_ARCH make(1) variables. In theory, this should have been a no-op, but the TARGET and TARGET_ARCH are now unset in load_target_env() to avoid collision with the chroot userland. r269630: Export variables in the arm/*.conf files because they need to be passed through release.sh to arm/release.sh. Set MK_TESTS=no for the xdev target. r269635: As part of the XDEV/XDEV_ARCH deprecation, the 'xdev-links' target was intentionally no longer invoked automatically. Invoke the xdev-links target after xdev, which creates, for example, /usr/bin/armv6-freebsd-cc symlink to /usr/armv6-freebsd/usr/bin/cc. r269637: Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH counterparts for the xdev and xdev-links make(1) targets. Sponsored by: The FreeBSD Foundation
* Add SRC_UPDATE_SKIP, DOC_UPDATE_SKIP, and PORTS_UPDATE_SKIPgjb2014-04-111-3/+5
| | | | | | | | | | | | | | | | 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.) Tested on: stable/9@r264319 MFC After: 3 days Sponsored by: The FreeBSD Foundation
* Add a new release build variable, WITH_COMPRESSED_IMAGES.gjb2014-04-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | When set to a non-empty value, the installation medium is compressed with gzip(1) as part of the 'install' target in the release/ directory. With gzip(1) compression, downloadable image are reduced in size quite significantly. Build test against head@263927 shows the following: bootonly.iso: 64% smaller disc1.iso: 44% smaller memstick.img: 47% smaller mini-memstick.img: 65% smaller dvd1.iso: untested This option is off by default, I would eventually like to turn it on by default, and remove the '-k' flag to gzip(1) so only compressed images are published on FTP. Requested by: wkoszek MFC After: 1 week Sponsored by: The FreeBSD Foundation
* Add a hack-ish attempt to provide backwards-compatibility withgjb2014-03-061-0/+10
| | | | | | | | | | release.conf SVNROOT entries that do not have a trailing '/'. In order to provide a mechanism to use !svn, the trailing '/' was added to SVNROOT so there were no assumptions being made about '/' being in the URL between SVNROOT and SRCBRANCH. Sponsored by: The FreeBSD Foundation
* Merge ^/projects/release-embedded into ^/head.gjb2014-03-051-22/+56
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After several months of testing and fixing (and breaking) various parts of release/release.sh changes, it is now possible to build FreeBSD/arm images as part of the release process. When EMBEDDEDBUILD is set in the release.conf file, release.sh will create the build environment, then run a separate script in release/${XDEV}/release.sh [1]. Currently, only arm is supported. The release/${XDEV}/release.sh configures the build environment specific for the target image, such as installing gcc(1), installing additional third-party software from the ports tree, and fetching external sources. Once the build environment is set up, release/${XDEV}/release.sh runs Crochet, written by Tim Kientzle, which builds the userland and kernel, and creates an image that can be written to an SD card with dd(1). Many thanks to Tim for his work on Crochet. Sample configurations for FreeBSD/arm boards are in the release/arm/ directory, and Crochet configuration files for each board are located in release/tools/arm/. Supported boards at this time are: BEAGLEBONE, PANDABOARD, RPI-B, and WANDBOARD-QUAD. Adding support for additional boards will continue in the projects/release-embedded/ branch, and incrementally merged back to head/. Many thanks to the FreeBSD Foundation for the support and sponsorship of this project. [1] XDEV is used in order to keep the various configurations organized by architecture, but since TARGET and TARGET_ARCH are used to build the chroot, the values of those variables cannot be used. MFC after: 1 month Sponsored by: The FreeBSD Foundation
| * Move ^/user/gjb/hacking/release-embedded up one directory, and removegjb2014-02-211-0/+243
| | | | | | | | | | | | ^/user/gjb/hacking since this is likely to be merged to head/ soon. Sponsored by: The FreeBSD Foundation
| * Copy head@r259933 -> user/gjb/hacking/release-embedded for initialgjb2013-12-271-215/+0
| | | | | | | | | | | | inclusion of (at least) arm builds with the release. Sponsored by: The FreeBSD Foundation
* | Rework how WORLD_FLAGS and KERNEL_FLAGS are set, to remove angjb2014-02-261-5/+3
| | | | | | | | | | | | | | | | | | unnecessary expr(1) call. Inspired by: hrs (a few months ago) MFC after: 1 week X-MFC-With: r262499, r262505 Sponsored by: The FreeBSD Foundation
* | release.sh:gjb2014-02-251-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. Submitted by: Rick Miller (based on) Sponsored by: The FreeBSD Foundation
* | Move build_doc_ports() to the if...fi block from which it is called.gjb2013-12-271-16/+12
|/ | | | Sponsored by: The FreeBSD Foundation
* Put the release objdir inside the chroot.jmmv2013-12-251-3/+6
| | | | | | | | | | | | When building the system from outside the chroot as part of the release process, ensure the objdir is within the chroot so that the whole output of the release.sh script is self-contained in a single directory. Use CHROOTDIR/tmp/obj instead of CHROOTDIR/usr/obj to minimize possible interferences with the output of the build itself. Reviewed by: gjb Approved by: rpaulo (mentor)
* Delay copying of resolv.conf into the chroot until /etc exists.jmmv2013-12-251-1/+1
| | | | | | | | | | With an unpopulated chroot dir, release building was failing because the script was attempting to copy resolv.conf into a non-existent /etc directory of the chroot. Fix this by copying the file only after the installworld has happened, which will create this directory. Reviewed by: gjb Approved by: rpaulo (mentor)
* Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actuallygjb2013-12-071-1/+4
| | | | | | | | passed to 'make release'. MFC after: 3 days X-Before-RC2: yes Sponsored by: The FreeBSD Foundation
* Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise thegjb2013-11-301-2/+2
| | | | | | | | | textproc/docproj port build fails. Pointyhat: gjb MFC after: 3 days X-Before-RC1: yes Sponsored by: The FreeBSD Foundation
* Unconditionally copy the build host /etc/resolv.conf intogjb2013-11-181-1/+1
| | | | | | | | | | the chroot directory, since hostname resolution may be needed in the case of building a dvd image (with packages) and also setting 'NOPORTS=1'. MFC after: 3 days X-MFC-With: r258305, r258307 Sponsored by: The FreeBSD Foundation
* Since the doc/ toolchain conversion to docbook 5.0, JADETEXgjb2013-11-131-1/+2
| | | | | | | | | | | | | | | | | | | | 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. MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Fix a few style nits.gjb2013-11-111-3/+3
| | | | | | MFC after: 3 days X-MFC-After: 10.0-RELEASE Sponsored by: The FreeBSD Foundation
* When building the textproc/docproj port, the ports-mgmt/pkg portgjb2013-11-041-0/+4
| | | | | | | | | | 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. MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Remove hash generation from release.sh, as it is run as part ofgjb2013-10-091-5/+0
| | | | | | | | | the 'install' target in the release/Makefile. MFC after: 3 days Submitted by: jhb Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
* Remove extra 'MAKE_FLAGS' line.gjb2013-09-191-1/+0
| | | | | | Submitted by: jhb Approved by: re (marius) Sponsored by: The FreeBSD Foundation
* Remove get_rev_branch(), functionality exists in the release/Makefile.gjb2013-08-131-13/+0
| | | | Submitted by: hrs
* - Only set ARCH_FLAGS (TARGET/TARGET_ARCH) if specified, otherwisegjb2013-08-131-18/+16
| | | | | | | | | | | | 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. Submitted by: hrs
* - Add SRC_FORCE_CHECKOUT configuration option to force svn to checkoutgjb2013-07-051-18/+39
| | | | | | | | | | | | | | | | | | | | | 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 Submitted by: Anes Mukhametov MFC after: 3 days Approved by: kib (mentor, implicit)
* If MAKE_CONF and/or SRC_CONF are set and not character devices,gjb2013-06-221-0/+11
| | | | | | | | copy to chroot to use with release build. Submitted by: Garrett Cooper (original version) Approved by: kib (mentor) MFC after: 1 week
* Fix OSVERSION variable within PBUILD_FLAGS.gjb2013-06-161-1/+1
| | | | | | | | Submitted by: Garrett Cooper (in part) Approved by: kib (mentor) MFC After: 1 week X-MFC-With: r251652 X-MFC-To: stable/9 only
* Add new script to run release builds. The script is heavily based upongjb2013-06-121-0/+193
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
OpenPOWER on IntegriCloud