#
304015 |
|
12-Aug-2016 |
gjb |
MFs11 r304014: MFC r303897: Pass overrides to make(1) when building ports for arm/armv6 targets, similar to what is done for the run-autotools-fixup override for non-arm targets.
While here, set SRCBRANCH in release.conf.sample to use releng/11.0, which is a direct commit to releng/11.0.
Approved by: re (kib) Sponsored by: The FreeBSD Foundation
|
#
304015 |
|
12-Aug-2016 |
gjb |
MFs11 r304014: MFC r303897: Pass overrides to make(1) when building ports for arm/armv6 targets, similar to what is done for the run-autotools-fixup override for non-arm targets.
While here, set SRCBRANCH in release.conf.sample to use releng/11.0, which is a direct commit to releng/11.0.
Approved by: re (kib) Sponsored by: The FreeBSD Foundation |
#
303975 |
|
11-Aug-2016 |
gjb |
Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, and rename it to RC1.
Update __FreeBSD_version.
Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and the dvd1.iso packages population.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
303878 |
|
09-Aug-2016 |
gjb |
Update the SRCBRANCH for release.sh to use stable/11 as the SRCBRANCH.
This is a direct commit to stable/11.
Approved by: re (kib) Sponsored by: The FreeBSD Foundation
|
#
302408 |
|
08-Jul-2016 |
gjb |
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, as nothing has been merged here.
Additional commits post-branch will follow.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
|
#
301280 |
|
03-Jun-2016 |
garga |
One of the already implemented options in release/Makefile is NOSRC. When it's defined, installation image is shipped without source distribution (src.txz)
Add the hability of defining NOSRC in release.conf and pass it to 'make release' argument
Approved by: gjb Sponsored by: Rubicon Communications (Netgate) Differential Revision: https://reviews.freebsd.org/D6710
|
#
300768 |
|
26-May-2016 |
gjb |
Update a commented line to replace recently-removed images with images that are published.
Sponsored by: The FreeBSD Foundation
|
#
281802 |
|
21-Apr-2015 |
gjb |
Merge the following from ^/projects/release-arm64 to allow building FreeBSD/arm64 VM images and memstick.img installation medium: r281786, r281788, r281792:
r281786: Add support for building arm64/aarch64 virtual machine images.
r281788: Copy amd64/make-memstick.sh to arm64/make-memstick.sh for aarch64 memory stick images.
Although arm64 does not yet have USB support, the memstick image should be bootable with certain virtualization tools, such as qemu.
r281792:
Add a buildenv_setup() prototype, intended to be overridden as needed.
For example, the arm64/aarch64 build needs devel/aarch64-binutils, so buildenv_setup() in the release.conf for this architecture handles the installation of the port before buildworld/buildkernel.
Sponsored by: The FreeBSD Foundation
|
#
279074 |
|
20-Feb-2015 |
gjb |
Default XZ_THREADS=0, and add to RELEASE_RMAKEFLAGS so it is passed to the 'release' make(1) target if it needs to be adjusted to a non-zero integer.
Sponsored by: The FreeBSD Foundation
|
#
277458 |
|
21-Jan-2015 |
gjb |
Merge the following revisions from ^/projects/release-vmimage: r273823-r273826, r273833, r273836, r273944, r274069-r274071, r274134, r274211, r274280-r274285, r274287-r274288, r274292, r274296-r274297, r274356, r274533, r274725, r274726, r274729, r274734, r274771, r274945-r274946, r277180, r277183-r277184, r277186-r277187, r277250-r277253, r277263-r277264, r277383-r277384, r277393-r277395, r277438-r277439, r277447, r277455:
r273823: Move virtual machine / cloud provider targets and options from release/Makefile to their own Makefile.
r273824: Add glue to allow enabling building cloud provider VM images by default.
When WITH_CLOUDWARE is not empty, add CLOUDTARGETS to the release/Makefile 'release' target.
r273825: Avoid hard-coding the Azure image file format. While here, avoid using OSRELEASE for the output file name.
r273826: Remove a few vestiges of passing an exit code to panic().
r273833: Initial commit providing a mechanism to create openstack images as part of the release build.
r273836: Fix output file name for openstack images. No further conversion is necessary for this VM file target, so there is no need to append the '.raw' suffix here.
r273944: Uncomment the cloudinit rc.conf(5) line.
r274069: Add line continuation so OPENSTACKCONF is actually included in the env(1).
r274070: Add a 'vm-cloudware' target, used to drive all targets in CLOUDTARGETS.
r274071: Add examples for WITH_CLOUDWARE to release.conf.sample. Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.
r274134: Initial rewrite to consolidate VM image build scripts into one.
r274211: Add write_partition_layout() used to populate the final image.
Fix duplicated mkimg(1) call in vm_create_disk().
Add primitive (untested) PowerPC/PowerPC64 VM image support.
Note: As it is currently written, the /boot/pmbr and /boot/{gptboot,boot1.hfs} use the build host and not the target build. Fixing this is likely going to be a hack in itself.
r274280: Return if vm_create_disk() is unsuccessful.
r274281: Add CLEANFILES entry for VM targets
r274282: Add vm_extra_pre_umount() prototype to vmimage.subr.
r274283: Fix DESTDIR for installworld, and make sure it is created before use.
r274284: Move usage() from vmimage.subr to mk-vmimage.sh, in case vmimage.subr has not been sourced.
r274285: Spell 'OPTARG' correctly. Actually call vm_create_base().
r274287: Fix line continuation in write_partition_layout(). Remove variable test that is no longer needed.
r274288: Fix scheme flag to mkimg(1).
r274292: mount(8) and umount(8) devfs(5) as needed.
r274296: Change path for mk-vmimage.sh from ${TARGET}/ to scripts/ now that it is consolidated into one file.
Fix paths for the base image and output disk image files.
r274297: Call cleanup() after everything is done.
r274356: Remove a stray directory from CLEANFILES.
r274533: Set the boot partition type to 'apple-boot' for powerpc.
r274725: In vm_install_base(), copy the host resolv.conf into the build chroot before attempting to do anything that requires working DNS (i.e., pkg bootstrap).
In vm_extra_pre_umount(), remove the resolv.conf before the disk image is unmounted from the backing md(4).
r274726 (cperciva): Silence errors when umounting the chroot's /dev, since it probably doesn't exist when we're running this.
Unmount filesystems before attempting to destroy the md which holds them.
r274729 (cperciva): Unmount filesystem and destroy md before we read the vnode from disk and package it into a disk image. Otherwise we end up packaging an unclean filesystem.
r274734 (cperciva): Merge duplicative vm-CLOUDTYPE targets before additional duplication gets added by the impending arrival of ec2 and gcloud.
r274771 (cperciva): Add NOSWAP option which can be set by a vmimage.conf file to specify that no swap space should be created in the image. This will be used by EC2 builds, since FreeBSD/EC2 allocates swap space on "ephemeral" disks which are physically attached to the Xen host node.
r274945: In vm_extra_install_packages(), only bootstrap pkg(8) if VM_EXTRA_PACKAGES is empty.
In vm_extra_pre_umount(), cleanup downloaded packages if pkg(8) was bootstrapped earlier.
r274946: Fix indentation nit.
r277180: In vm_extra_install_base(), do not install waagent in the openstack image, because it is not used. This appears to be a copy mistake.
Remove vm_extra_install_base() from the openstack.conf entirely, since it does not need to be overridden.
r277183: Enable the textmode console by default for VM images, since there is no way to tell if the environment will be able to use the graphics-mode console.
r277184: Enable password-less sudo for openstack images.
r277186: Update the VM_EXTRA_PACKAGES list for the openstack images.
The documentation suggests doing a "just fetch this and run it"-style bootstrap, from which the list of dependencies was obtained (in github, at: pellaeon/bsd-cloudinit-installer)
There is one Python dependency unmet, oslo.config, which is not in the Ports Collection.
r277187: Add a comment to note that setting hw.vga.textmode=1 is temporary.
r277250: Remove vm_extra_install_base() for the Azure image, now that the waagent exists in the ports tree.
Add sysutils/azure-agent to the VM_EXTRA_PACKAGES list.
In vm_extra_pre_umount(), remove the explicit pkg(8) install list, as dependencies are resolved by sysutils/azure-agent.
r277251: Add a 'list-cloudware' target to print the list of supported CLOUDWARE values and a description.
Add the AZURE_DESC and OPENSTACK_DESC descriptions.
r277252: Update release(7)
r277253: Add 'list-vmtargets' target, which produces a list of all supported VM and cloud provider images.
Add VHD_DESC, VMDK_DESC, QCOW2_DESC, RAW_DESC image descriptions.
Format the output to make a bit more readable.
Update release(7) to document the list-vmtargets target.
r277263: Add initial support for the GCE (Google Compute Engine) cloud hosting provider image.
r277264: Style and line length cleanup.
r277383: Remove the console setting from rc.conf(5), which is not used there. While here, set console to include vidconsole in the loader.conf(5).
r277384: Fix an indentation nit. No functional changes.
r277393: Remove the pkg-clean(8) call from vm_extra_pre_umount() since the function is often overridden.
Add vm_extra_pkg_rmcache() to call pkg-clean(8) to avoid duplicated code.
r277394: Move resolv.conf(5) removal back to vm_extra_pre_umount() where it belongs.
The GCE image needs resolv.conf(5) to exist (created as part of the image setup), so it cannot be removed.
r277395: Comment the line that configures ttys(5) to 'off', which makes it impossible to test that the image boots.
Add a note explaining why the line is commented, and not (yet) removed entirely.
r277438: Move the 'install' bits that are specific to virtual machine images from the Makefile to Makefile.vm.
Rename the 'install' target to 'release-install', and add a new 'vm-install' target.
Add a new 'install' target that invokes the new targets.
r277439: Add WITH_CLOUDWARE to the list of make(1) variables for the release build.
r277447: Remove hw.vga.textmode=1 from the VM image loader.conf, which was included during test builds and not intended to be included when merging this project branch back to head.
r277455: Remove mk-azure.sh, which is no longer needed.
MFC after: 1 month X-MFC-To: stable/10 (requires mkimg(1)) Help from: cperciva, swills Relnotes: yes Sponsored by: The FreeBSD Foundation
|
#
272414 |
|
02-Oct-2014 |
gjb |
Merge the following revisions from ^/projects/release-vmimage:
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
|
#
269640 |
|
06-Aug-2014 |
gjb |
Comment load_chroot_env() and load_target_env() in the release/release.conf.sample file. The uncommented version snuck in during testing.
Sponsored by: The FreeBSD Foundation
|
#
269639 |
|
06-Aug-2014 |
gjb |
Merge the following from ^/projects/release-noxdev: 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
|
#
264343 |
|
11-Apr-2014 |
gjb |
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.)
Tested on: stable/9@r264319 MFC After: 3 days Sponsored by: The FreeBSD Foundation
|
#
264027 |
|
01-Apr-2014 |
gjb |
Add a new release build variable, WITH_COMPRESSED_IMAGES.
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
|
#
262810 |
|
05-Mar-2014 |
gjb |
Merge ^/projects/release-embedded into ^/head.
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
|
#
262513 |
|
26-Feb-2014 |
gjb |
Update release/release.conf.sample to reflect changes in r262509.
MFC after: 1 week X-MFC-With: r262509 Sponsored by: The FreeBSD Foundation
|
#
262499 |
|
25-Feb-2014 |
gjb |
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.
Submitted by: Rick Miller (based on) Sponsored by: The FreeBSD Foundation
|
#
259079 |
|
07-Dec-2013 |
gjb |
Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually passed to 'make release'.
MFC after: 3 days X-Before-RC2: yes Sponsored by: The FreeBSD Foundation
|
#
254293 |
|
13-Aug-2013 |
gjb |
- 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.
Submitted by: hrs
|
#
252846 |
|
05-Jul-2013 |
gjb |
- 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 Submitted by: Anes Mukhametov MFC after: 3 days 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
|