2013-06-12 13:15:28 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#-
|
MFC r277458, r277536, r277606, r277609, r277836, r277839,
r278118, r278119, r278206, r278502:
r277458:
Move virtual machine / cloud provider targets and
options from release/Makefile to their own Makefile.
Add glue to allow enabling building cloud provider VM images
by default.
Add a 'vm-cloudware' target, used to drive all targets in
CLOUDTARGETS.
Add examples for WITH_CLOUDWARE to release.conf.sample.
Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.
Rewrite to consolidate VM image build scripts into one.
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.
mount(8) and umount(8) devfs(5) as needed.
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.
Set the boot partition type to 'apple-boot' for powerpc.
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).
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.
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.
Merge duplicative vm-CLOUDTYPE targets before additional duplication
gets added by the impending arrival of ec2 and gcloud.
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.
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.
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.
Enable password-less sudo for openstack images.
Update the VM_EXTRA_PACKAGES list for the openstack images.
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.
Add a 'list-cloudware' target to print the list of supported CLOUDWARE
values and a description.
Add the AZURE_DESC and OPENSTACK_DESC descriptions.
Update release(7)
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.
Update release(7) to document the list-vmtargets target.
Add initial support for the GCE (Google Compute Engine) cloud hosting
provider image.
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).
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.
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.
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.
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.
Add WITH_CLOUDWARE to the list of make(1) variables for the release
build.
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.
Remove mk-azure.sh, which is no longer needed.
r277536:
Rename the 'release' target to 'real-release', and add two targets,
'vm-release' and 'cloudware-release', that are invoked if
WITH_VMIMAGES and WITH_CLOUDWARE are not empty.
This fixes an issue where 'make release' would not build the cloud
provider targets because CLOUDWARE was not yet set.
Move the WITH_VMIMAGES and WITH_CLOUDWARE targets to Makefile.vm.
Note: There is no 'cloudware-install' target yet, since some of the
disk image names may need to be specific to the provider, so this is
probably best handled by the build scripts.
r277606:
Provide a recipe of "true" for building the "release" target once
its prerequisites are satisfied, in order to avoid having an implicit
rule triggered by the presence of release.sh.
r277609:
When iterating through VMFORMATS, the VMBASE file is not removed
or truncated to a zero-size file, which if used to create more
than one disk image format, can result in accidental pollution of
the target formatted disk image.
Instead of using a single VMBASE image (vm.img, by default), use
a single base file for each format, named as VMFORMAT.img, which
produces VMBASE.VMFORMAT as the final formatted image.
r277836:
Rename the 'system' target to 'disc1', which is specific to the
disc1.iso installer image.
Replace 'system' with 'release' in CLEANFILES, and add 'disc1'
to CLEANDIRS.
Ensure the 'dvd' target depends on 'packagesystem'.
Fix 'mini-memstick.img' prerequisite, which should be the 'bootonly'
target, not 'disc1' (previously 'system').
Use .TARGET as the target installation directory for the disc1.iso
and bootonly.iso images, which now expand to 'disc1' and 'bootonly'
respectively, mimicking the behavior of the 'dvd' target.
Remove '@true' from the 'release' target, and instead use
'touch ${.TARGET}' to prevent multiple iterations of
'make release' from clobbering previously-built installer
medium.
r277839:
Update release(7) to reflect renaming the 'system' target to 'disc1'.
r278118:
Move service_enable="YES" rc.conf(5) additions to VM_RC_LIST and
deduplicate.
Evaluate if firstboot_freebsd_update should be enabled based on
UNAME_r, because it is not supported for the -CURRENT or -STABLE
branches.
r278119:
Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4)
r278206:
Bump copyright after r277458.
r278502:
In scripts/mk-vmimage.sh, prevent incorrect usage() by defaulting
VMCONFIG to /dev/null, and additionally ensuring VMCONFIG is not
a character device before it is sourced.
While here, be sure to exit if usage() is called.
This should effectively be no-op, but the usage() output was
discovered while investigating a larger issue.
* Several changes local to stable/10 were needed in order to handle
UEFI images that are specific to this branch.
Tested with: stable/10@r278906
Sponsored by: The FreeBSD Foundation
2015-02-19 03:57:47 +00:00
|
|
|
# Copyright (c) 2013-2015 The FreeBSD Foundation
|
2013-06-12 13:15:28 +00:00
|
|
|
# Copyright (c) 2013 Glen Barber
|
|
|
|
# Copyright (c) 2011 Nathan Whitehorn
|
|
|
|
# All rights reserved.
|
|
|
|
#
|
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
2014-03-05 00:45:28 +00:00
|
|
|
# Portions of this software were developed by Glen Barber
|
|
|
|
# under sponsorship from the FreeBSD Foundation.
|
|
|
|
#
|
2013-06-12 13:15:28 +00:00
|
|
|
# Redistribution and use in source and binary forms, with or without
|
|
|
|
# modification, are permitted provided that the following conditions
|
|
|
|
# are met:
|
|
|
|
# 1. Redistributions of source code must retain the above copyright
|
|
|
|
# notice, this list of conditions and the following disclaimer.
|
|
|
|
# 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
|
|
# documentation and/or other materials provided with the distribution.
|
|
|
|
#
|
|
|
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
# SUCH DAMAGE.
|
|
|
|
#
|
|
|
|
# release.sh: check out source trees, and build release components with
|
|
|
|
# totally clean, fresh trees.
|
|
|
|
# Based on release/generate-release.sh written by Nathan Whitehorn
|
|
|
|
#
|
|
|
|
# $FreeBSD$
|
|
|
|
#
|
|
|
|
|
|
|
|
PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
|
|
|
|
export PATH
|
|
|
|
|
|
|
|
# The directory within which the release will be built.
|
|
|
|
CHROOTDIR="/scratch"
|
2014-04-04 07:34:46 +00:00
|
|
|
RELENGDIR="$(realpath $(dirname $(basename ${0})))"
|
2013-06-12 13:15:28 +00:00
|
|
|
|
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
2014-03-05 00:45:28 +00:00
|
|
|
# The default version control system command to obtain the sources.
|
|
|
|
VCSCMD="svn checkout"
|
|
|
|
|
2013-06-12 13:15:28 +00:00
|
|
|
# The default svn checkout server, and svn branches for src/, doc/,
|
|
|
|
# and ports/.
|
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
2014-03-05 00:45:28 +00:00
|
|
|
SVNROOT="svn://svn.FreeBSD.org/"
|
2013-08-13 20:16:14 +00:00
|
|
|
SRCBRANCH="base/head@rHEAD"
|
|
|
|
DOCBRANCH="doc/head@rHEAD"
|
|
|
|
PORTBRANCH="ports/head@rHEAD"
|
2013-06-12 13:15:28 +00:00
|
|
|
|
2014-04-04 07:34:46 +00:00
|
|
|
# Set for embedded device builds.
|
|
|
|
EMBEDDEDBUILD=
|
|
|
|
|
2013-07-05 22:04:49 +00:00
|
|
|
# Sometimes one needs to checkout src with --force svn option.
|
|
|
|
# If custom kernel configs copied to src tree before checkout, e.g.
|
|
|
|
SRC_FORCE_CHECKOUT=
|
|
|
|
|
2013-06-12 13:15:28 +00:00
|
|
|
# The default make.conf and src.conf to use. Set to /dev/null
|
|
|
|
# by default to avoid polluting the chroot(8) environment with
|
|
|
|
# non-default settings.
|
|
|
|
MAKE_CONF="/dev/null"
|
|
|
|
SRC_CONF="/dev/null"
|
|
|
|
|
|
|
|
# The number of make(1) jobs, defaults to the number of CPUs available for
|
|
|
|
# buildworld, and half of number of CPUs available for buildkernel.
|
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
2014-03-05 00:45:28 +00:00
|
|
|
WORLD_FLAGS="-j$(sysctl -n hw.ncpu)"
|
|
|
|
KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))"
|
|
|
|
|
2013-06-12 13:15:28 +00:00
|
|
|
MAKE_FLAGS="-s"
|
|
|
|
|
|
|
|
# The name of the kernel to build, defaults to GENERIC.
|
|
|
|
KERNEL="GENERIC"
|
|
|
|
|
|
|
|
# Set to non-empty value to disable checkout of doc/ and/or ports/. Disabling
|
|
|
|
# ports/ checkout also forces NODOC to be set.
|
|
|
|
NODOC=
|
|
|
|
NOPORTS=
|
|
|
|
|
2013-12-10 00:35:33 +00:00
|
|
|
# Set to non-empty value to build dvd1.iso as part of the release.
|
|
|
|
WITH_DVD=
|
2014-04-08 00:53:31 +00:00
|
|
|
WITH_COMPRESSED_IMAGES=
|
2013-12-10 00:35:33 +00:00
|
|
|
|
MFC r272414:
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.
Sponsored by: The FreeBSD Foundation
2014-10-14 12:23:44 +00:00
|
|
|
# Set to non-empty value to build virtual machine images as part of
|
|
|
|
# the release.
|
|
|
|
WITH_VMIMAGES=
|
|
|
|
WITH_COMPRESSED_VMIMAGES=
|
|
|
|
|
MFC r277458, r277536, r277606, r277609, r277836, r277839,
r278118, r278119, r278206, r278502:
r277458:
Move virtual machine / cloud provider targets and
options from release/Makefile to their own Makefile.
Add glue to allow enabling building cloud provider VM images
by default.
Add a 'vm-cloudware' target, used to drive all targets in
CLOUDTARGETS.
Add examples for WITH_CLOUDWARE to release.conf.sample.
Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.
Rewrite to consolidate VM image build scripts into one.
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.
mount(8) and umount(8) devfs(5) as needed.
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.
Set the boot partition type to 'apple-boot' for powerpc.
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).
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.
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.
Merge duplicative vm-CLOUDTYPE targets before additional duplication
gets added by the impending arrival of ec2 and gcloud.
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.
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.
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.
Enable password-less sudo for openstack images.
Update the VM_EXTRA_PACKAGES list for the openstack images.
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.
Add a 'list-cloudware' target to print the list of supported CLOUDWARE
values and a description.
Add the AZURE_DESC and OPENSTACK_DESC descriptions.
Update release(7)
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.
Update release(7) to document the list-vmtargets target.
Add initial support for the GCE (Google Compute Engine) cloud hosting
provider image.
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).
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.
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.
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.
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.
Add WITH_CLOUDWARE to the list of make(1) variables for the release
build.
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.
Remove mk-azure.sh, which is no longer needed.
r277536:
Rename the 'release' target to 'real-release', and add two targets,
'vm-release' and 'cloudware-release', that are invoked if
WITH_VMIMAGES and WITH_CLOUDWARE are not empty.
This fixes an issue where 'make release' would not build the cloud
provider targets because CLOUDWARE was not yet set.
Move the WITH_VMIMAGES and WITH_CLOUDWARE targets to Makefile.vm.
Note: There is no 'cloudware-install' target yet, since some of the
disk image names may need to be specific to the provider, so this is
probably best handled by the build scripts.
r277606:
Provide a recipe of "true" for building the "release" target once
its prerequisites are satisfied, in order to avoid having an implicit
rule triggered by the presence of release.sh.
r277609:
When iterating through VMFORMATS, the VMBASE file is not removed
or truncated to a zero-size file, which if used to create more
than one disk image format, can result in accidental pollution of
the target formatted disk image.
Instead of using a single VMBASE image (vm.img, by default), use
a single base file for each format, named as VMFORMAT.img, which
produces VMBASE.VMFORMAT as the final formatted image.
r277836:
Rename the 'system' target to 'disc1', which is specific to the
disc1.iso installer image.
Replace 'system' with 'release' in CLEANFILES, and add 'disc1'
to CLEANDIRS.
Ensure the 'dvd' target depends on 'packagesystem'.
Fix 'mini-memstick.img' prerequisite, which should be the 'bootonly'
target, not 'disc1' (previously 'system').
Use .TARGET as the target installation directory for the disc1.iso
and bootonly.iso images, which now expand to 'disc1' and 'bootonly'
respectively, mimicking the behavior of the 'dvd' target.
Remove '@true' from the 'release' target, and instead use
'touch ${.TARGET}' to prevent multiple iterations of
'make release' from clobbering previously-built installer
medium.
r277839:
Update release(7) to reflect renaming the 'system' target to 'disc1'.
r278118:
Move service_enable="YES" rc.conf(5) additions to VM_RC_LIST and
deduplicate.
Evaluate if firstboot_freebsd_update should be enabled based on
UNAME_r, because it is not supported for the -CURRENT or -STABLE
branches.
r278119:
Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4)
r278206:
Bump copyright after r277458.
r278502:
In scripts/mk-vmimage.sh, prevent incorrect usage() by defaulting
VMCONFIG to /dev/null, and additionally ensuring VMCONFIG is not
a character device before it is sourced.
While here, be sure to exit if usage() is called.
This should effectively be no-op, but the usage() output was
discovered while investigating a larger issue.
* Several changes local to stable/10 were needed in order to handle
UEFI images that are specific to this branch.
Tested with: stable/10@r278906
Sponsored by: The FreeBSD Foundation
2015-02-19 03:57:47 +00:00
|
|
|
# Set to non-empty value to build virtual machine images for various
|
|
|
|
# cloud providers as part of the release.
|
|
|
|
WITH_CLOUDWARE=
|
|
|
|
|
2013-06-12 13:15:28 +00:00
|
|
|
usage() {
|
|
|
|
echo "Usage: $0 [-c release.conf]"
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
|
|
|
while getopts c: opt; do
|
|
|
|
case ${opt} in
|
|
|
|
c)
|
|
|
|
RELEASECONF="${OPTARG}"
|
|
|
|
if [ ! -e "${RELEASECONF}" ]; then
|
|
|
|
echo "ERROR: Configuration file ${RELEASECONF} does not exist."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
# Source the specified configuration file for overrides
|
|
|
|
. ${RELEASECONF}
|
|
|
|
;;
|
|
|
|
\?)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
shift $(($OPTIND - 1))
|
|
|
|
|
2014-04-04 07:34:46 +00:00
|
|
|
# Fix for backwards-compatibility with release.conf that does not have the
|
|
|
|
# trailing '/'.
|
|
|
|
case ${SVNROOT} in
|
|
|
|
*svn*)
|
|
|
|
SVNROOT="${SVNROOT}/"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
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
2014-03-05 00:45:28 +00:00
|
|
|
# Prefix the branches with the SVNROOT for the full checkout URL.
|
|
|
|
SRCBRANCH="${SVNROOT}${SRCBRANCH}"
|
|
|
|
DOCBRANCH="${SVNROOT}${DOCBRANCH}"
|
|
|
|
PORTBRANCH="${SVNROOT}${PORTBRANCH}"
|
|
|
|
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -n "${EMBEDDEDBUILD}" ]; then
|
|
|
|
if [ -z "${XDEV}" ] || [ -z "${XDEV_ARCH}" ]; then
|
|
|
|
echo "ERROR: XDEV and XDEV_ARCH must be set in ${RELEASECONF}."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
WITH_DVD=
|
2014-04-08 00:53:31 +00:00
|
|
|
WITH_COMPRESSED_IMAGES=
|
2014-04-04 07:34:46 +00:00
|
|
|
NODOC=yes
|
|
|
|
fi
|
|
|
|
|
2013-07-05 22:04:49 +00:00
|
|
|
# If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
|
|
|
|
# is required to build the documentation set.
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -n "${NOPORTS}" ] && [ -z "${NODOC}" ]; then
|
2013-07-05 22:04:49 +00:00
|
|
|
echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
|
|
|
|
echo " and NOPORTS is set."
|
|
|
|
NODOC=yes
|
|
|
|
fi
|
|
|
|
|
|
|
|
# If NOPORTS and/or NODOC are unset, they must not pass to make as variables.
|
|
|
|
# The release makefile verifies definedness of NOPORTS/NODOC variables
|
|
|
|
# instead of their values.
|
|
|
|
DOCPORTS=
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -n "${NOPORTS}" ]; then
|
MFC r257805, r257806, r257807, r257942:
r257805:
Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.
This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted). In addition, it is possible
to do bootonly-style installation, where the base.txz, kernel.txz,
etc. are fetched from a remote source.
Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.
r257806:
Remove extra target from 'memstick' that I forgot to remove before
previous commit.
r257807:
Update release(7) to include 'mini-memstick'.
r257942:
Fix a few style nits.
Sponsored by: The FreeBSD Foundation
2013-12-11 19:26:56 +00:00
|
|
|
DOCPORTS="NOPORTS=yes "
|
2013-07-05 22:04:49 +00:00
|
|
|
fi
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -n "${NODOC}" ]; then
|
MFC r257805, r257806, r257807, r257942:
r257805:
Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.
This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted). In addition, it is possible
to do bootonly-style installation, where the base.txz, kernel.txz,
etc. are fetched from a remote source.
Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.
r257806:
Remove extra target from 'memstick' that I forgot to remove before
previous commit.
r257807:
Update release(7) to include 'mini-memstick'.
r257942:
Fix a few style nits.
Sponsored by: The FreeBSD Foundation
2013-12-11 19:26:56 +00:00
|
|
|
DOCPORTS="${DOCPORTS}NODOC=yes"
|
2013-07-05 22:04:49 +00:00
|
|
|
fi
|
|
|
|
|
2013-06-12 13:15:28 +00:00
|
|
|
# The aggregated build-time flags based upon variables defined within
|
|
|
|
# this file, unless overridden by release.conf. In most cases, these
|
|
|
|
# will not need to be changed.
|
|
|
|
CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
|
2013-08-13 20:16:14 +00:00
|
|
|
ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
|
|
|
|
else
|
|
|
|
ARCH_FLAGS=
|
|
|
|
fi
|
2014-04-04 07:34:46 +00:00
|
|
|
CHROOT_MAKEENV="${CHROOT_MAKEENV} MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
|
2013-06-12 13:15:28 +00:00
|
|
|
CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
|
|
|
|
CHROOT_IMAKEFLAGS="${CONF_FILES}"
|
|
|
|
CHROOT_DMAKEFLAGS="${CONF_FILES}"
|
|
|
|
RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
|
2013-07-05 22:04:49 +00:00
|
|
|
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
|
|
|
|
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
|
MFC r277458, r277536, r277606, r277609, r277836, r277839,
r278118, r278119, r278206, r278502:
r277458:
Move virtual machine / cloud provider targets and
options from release/Makefile to their own Makefile.
Add glue to allow enabling building cloud provider VM images
by default.
Add a 'vm-cloudware' target, used to drive all targets in
CLOUDTARGETS.
Add examples for WITH_CLOUDWARE to release.conf.sample.
Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.
Rewrite to consolidate VM image build scripts into one.
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.
mount(8) and umount(8) devfs(5) as needed.
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.
Set the boot partition type to 'apple-boot' for powerpc.
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).
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.
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.
Merge duplicative vm-CLOUDTYPE targets before additional duplication
gets added by the impending arrival of ec2 and gcloud.
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.
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.
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.
Enable password-less sudo for openstack images.
Update the VM_EXTRA_PACKAGES list for the openstack images.
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.
Add a 'list-cloudware' target to print the list of supported CLOUDWARE
values and a description.
Add the AZURE_DESC and OPENSTACK_DESC descriptions.
Update release(7)
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.
Update release(7) to document the list-vmtargets target.
Add initial support for the GCE (Google Compute Engine) cloud hosting
provider image.
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).
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.
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.
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.
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.
Add WITH_CLOUDWARE to the list of make(1) variables for the release
build.
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.
Remove mk-azure.sh, which is no longer needed.
r277536:
Rename the 'release' target to 'real-release', and add two targets,
'vm-release' and 'cloudware-release', that are invoked if
WITH_VMIMAGES and WITH_CLOUDWARE are not empty.
This fixes an issue where 'make release' would not build the cloud
provider targets because CLOUDWARE was not yet set.
Move the WITH_VMIMAGES and WITH_CLOUDWARE targets to Makefile.vm.
Note: There is no 'cloudware-install' target yet, since some of the
disk image names may need to be specific to the provider, so this is
probably best handled by the build scripts.
r277606:
Provide a recipe of "true" for building the "release" target once
its prerequisites are satisfied, in order to avoid having an implicit
rule triggered by the presence of release.sh.
r277609:
When iterating through VMFORMATS, the VMBASE file is not removed
or truncated to a zero-size file, which if used to create more
than one disk image format, can result in accidental pollution of
the target formatted disk image.
Instead of using a single VMBASE image (vm.img, by default), use
a single base file for each format, named as VMFORMAT.img, which
produces VMBASE.VMFORMAT as the final formatted image.
r277836:
Rename the 'system' target to 'disc1', which is specific to the
disc1.iso installer image.
Replace 'system' with 'release' in CLEANFILES, and add 'disc1'
to CLEANDIRS.
Ensure the 'dvd' target depends on 'packagesystem'.
Fix 'mini-memstick.img' prerequisite, which should be the 'bootonly'
target, not 'disc1' (previously 'system').
Use .TARGET as the target installation directory for the disc1.iso
and bootonly.iso images, which now expand to 'disc1' and 'bootonly'
respectively, mimicking the behavior of the 'dvd' target.
Remove '@true' from the 'release' target, and instead use
'touch ${.TARGET}' to prevent multiple iterations of
'make release' from clobbering previously-built installer
medium.
r277839:
Update release(7) to reflect renaming the 'system' target to 'disc1'.
r278118:
Move service_enable="YES" rc.conf(5) additions to VM_RC_LIST and
deduplicate.
Evaluate if firstboot_freebsd_update should be enabled based on
UNAME_r, because it is not supported for the -CURRENT or -STABLE
branches.
r278119:
Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4)
r278206:
Bump copyright after r277458.
r278502:
In scripts/mk-vmimage.sh, prevent incorrect usage() by defaulting
VMCONFIG to /dev/null, and additionally ensuring VMCONFIG is not
a character device before it is sourced.
While here, be sure to exit if usage() is called.
This should effectively be no-op, but the usage() output was
discovered while investigating a larger issue.
* Several changes local to stable/10 were needed in order to handle
UEFI images that are specific to this branch.
Tested with: stable/10@r278906
Sponsored by: The FreeBSD Foundation
2015-02-19 03:57:47 +00:00
|
|
|
${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
|
|
|
|
WITH_CLOUDWARE=${WITH_CLOUDWARE}"
|
2013-07-05 22:04:49 +00:00
|
|
|
|
|
|
|
# Force src checkout if configured
|
|
|
|
FORCE_SRC_KEY=
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -n "${SRC_FORCE_CHECKOUT}" ]; then
|
MFC r257805, r257806, r257807, r257942:
r257805:
Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.
This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted). In addition, it is possible
to do bootonly-style installation, where the base.txz, kernel.txz,
etc. are fetched from a remote source.
Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.
r257806:
Remove extra target from 'memstick' that I forgot to remove before
previous commit.
r257807:
Update release(7) to include 'mini-memstick'.
r257942:
Fix a few style nits.
Sponsored by: The FreeBSD Foundation
2013-12-11 19:26:56 +00:00
|
|
|
FORCE_SRC_KEY="--force"
|
2013-06-12 13:15:28 +00:00
|
|
|
fi
|
|
|
|
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -z "${CHROOTDIR}" ]; then
|
2013-06-12 13:15:28 +00:00
|
|
|
echo "Please set CHROOTDIR."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ $(id -u) -ne 0 ]; then
|
|
|
|
echo "Needs to be run as root."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
set -e # Everything must succeed
|
|
|
|
|
|
|
|
mkdir -p ${CHROOTDIR}/usr
|
|
|
|
|
2014-04-14 03:57:45 +00:00
|
|
|
if [ -z "${SRC_UPDATE_SKIP}" ]; then
|
|
|
|
${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
|
|
|
|
fi
|
|
|
|
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
|
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
2014-03-05 00:45:28 +00:00
|
|
|
${VCSCMD} ${DOCBRANCH} ${CHROOTDIR}/usr/doc
|
2013-06-12 13:15:28 +00:00
|
|
|
fi
|
2014-04-14 03:57:45 +00:00
|
|
|
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
|
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
2014-03-05 00:45:28 +00:00
|
|
|
${VCSCMD} ${PORTBRANCH} ${CHROOTDIR}/usr/ports
|
2013-06-12 13:15:28 +00:00
|
|
|
fi
|
|
|
|
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -z "${CHROOTBUILD_SKIP}" ]; then
|
|
|
|
cd ${CHROOTDIR}/usr/src
|
|
|
|
env ${CHROOT_MAKEENV} make ${CHROOT_WMAKEFLAGS} buildworld
|
|
|
|
env ${CHROOT_MAKEENV} make ${CHROOT_IMAKEFLAGS} installworld \
|
|
|
|
DESTDIR=${CHROOTDIR}
|
|
|
|
env ${CHROOT_MAKEENV} make ${CHROOT_DMAKEFLAGS} distribution \
|
|
|
|
DESTDIR=${CHROOTDIR}
|
|
|
|
fi
|
2013-06-12 13:15:28 +00:00
|
|
|
mount -t devfs devfs ${CHROOTDIR}/dev
|
2013-12-30 02:19:23 +00:00
|
|
|
cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
|
2013-06-12 13:15:28 +00:00
|
|
|
trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
|
|
|
|
|
2013-06-22 22:12:24 +00:00
|
|
|
# If MAKE_CONF and/or SRC_CONF are set and not character devices (/dev/null),
|
|
|
|
# copy them to the chroot.
|
|
|
|
if [ -e ${MAKE_CONF} ] && [ ! -c ${MAKE_CONF} ]; then
|
|
|
|
mkdir -p ${CHROOTDIR}/$(dirname ${MAKE_CONF})
|
|
|
|
cp ${MAKE_CONF} ${CHROOTDIR}/${MAKE_CONF}
|
|
|
|
fi
|
|
|
|
if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then
|
|
|
|
mkdir -p ${CHROOTDIR}/$(dirname ${SRC_CONF})
|
|
|
|
cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF}
|
|
|
|
fi
|
|
|
|
|
2014-04-04 07:34:46 +00:00
|
|
|
# Embedded builds do not use the 'make release' target.
|
|
|
|
if [ -n "${EMBEDDEDBUILD}" ]; then
|
|
|
|
# If a crochet configuration file exists in *this* checkout of
|
|
|
|
# release/, copy it to the /tmp/external directory within the chroot.
|
|
|
|
# This allows building embedded releases without relying on updated
|
|
|
|
# scripts and/or configurations to exist in the branch being built.
|
|
|
|
if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \
|
|
|
|
[ -e ${RELENGDIR}/${XDEV}/release.sh ]; then
|
|
|
|
mkdir -p ${CHROOTDIR}/tmp/external/${XDEV}/
|
|
|
|
cp ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf \
|
|
|
|
${CHROOTDIR}/tmp/external/${XDEV}/crochet-${KERNEL}.conf
|
|
|
|
/bin/sh ${RELENGDIR}/${XDEV}/release.sh
|
|
|
|
fi
|
|
|
|
# If the script does not exist for this architecture, exit.
|
|
|
|
# This probably should be checked earlier, but allowing the rest
|
|
|
|
# of the build process to get this far will at least set up the
|
|
|
|
# chroot environment for testing.
|
|
|
|
exit 0
|
|
|
|
else
|
|
|
|
# Not embedded.
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
2013-06-12 13:15:28 +00:00
|
|
|
if [ -d ${CHROOTDIR}/usr/ports ]; then
|
2013-12-30 02:19:23 +00:00
|
|
|
# Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints
|
|
|
|
# is created. This is needed by ports-mgmt/pkg.
|
|
|
|
chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
|
|
|
|
|
|
|
|
## Trick the ports 'run-autotools-fixup' target to do the right thing.
|
|
|
|
_OSVERSION=$(sysctl -n kern.osreldate)
|
2014-08-27 00:50:51 +00:00
|
|
|
REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
|
|
|
|
BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
|
|
|
|
UNAME_r=${REVISION}-${BRANCH}
|
2014-04-04 07:34:46 +00:00
|
|
|
if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
|
2013-12-30 02:19:23 +00:00
|
|
|
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
|
2014-08-27 00:50:51 +00:00
|
|
|
PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
|
|
|
|
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
|
2013-12-30 02:19:23 +00:00
|
|
|
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
|
2014-08-27 00:50:51 +00:00
|
|
|
${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
|
|
|
|
install clean distclean
|
2013-12-30 02:19:23 +00:00
|
|
|
fi
|
2013-06-12 13:15:28 +00:00
|
|
|
fi
|
|
|
|
|
2013-07-05 22:04:49 +00:00
|
|
|
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
|
|
|
|
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
|
|
|
|
eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
|
2014-04-04 07:34:46 +00:00
|
|
|
release
|
2013-07-05 22:04:49 +00:00
|
|
|
eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
|
MFC r272414:
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.
Sponsored by: The FreeBSD Foundation
2014-10-14 12:23:44 +00:00
|
|
|
install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \
|
|
|
|
WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES}
|