#
274104 |
|
04-Nov-2014 |
gjb |
MFstable10 r274102: MFC r274095: Fix VOLUME_LABEL when BRANCH contains '-' and '.' characters.
Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
|
#
273699 |
|
26-Oct-2014 |
gjb |
MFstable10 r273698: MFC r273653: Fix a few issues with creating VOLUME_LABEL for the installation ISOs:
- TYPE, BRANCH, and REVISION are only defined if OSRELEASE is not defined, so in situations where one might set OSRELEASE for an in-house ISO build, VOLUME_LABEL would be empty.
- makefs(8) limits the volume label to 32 characters, which for the powerpc64 case, OSRELEASE expands to FreeBSD-11.0-CURRENT-powerpc-powerpc64. Even with removing the prefixing 'FreeBSD-', the string is 30 characters long, leaving zero room for suffixing the type of ISO media (BO for bootonly, CD for cdrom, and DVD for dvdrom).
Resolve these by defining VOLUME_LABEL when defining OSRELEASE if unset. If OSRELEASE is defined by the builder, use the OSRELEASE from that definition as the VOLUME_LABEL.
In addition, for cases where both TARGET and TARGET_ARCH are used for the VOLUME_LABEL, use TARGET_ARCH if it differs from TARGET.
There are probably a few sharp edges here yet, but these problems are going to affect the powerpc/powerpc64 builds for 10.1-RELEASE, so the immediate concern is fixing the underlying problem at hand quickly, and less so about the elegance of the fix.
Approved by: re (kib) Sponsored by: The FreeBSD Foundation
|
#
273364 |
|
21-Oct-2014 |
gjb |
MFstable10 r273354: MFC r273204: Add more descriptive metadata to the ISO images.
MFstable10 r273355: Fix label for the UEFI bootonly cd.
PR: 165876 Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
|
#
273199 |
|
16-Oct-2014 |
gjb |
MFstable10 r273198: MFC r273093, r273096:
r273093: Merge the following from ^/projects/release-vmimage: r272436, r272437, r272792:
r272436: Remove the first argument to panic(), which was initially intended to be the exit code, however when a non-zero exit code was returned to release/Makefile, this would prevent any remaining (and possibly successful) stages from being attempted.
r272437:
If the vm-base target fails, prevent the vm-image target from being run since it cannot possibly succeed.
r272792:
Add /usr/local/bin and /usr/local/sbin to PATH, needed if third-party software needs to use utilities outside of the base system during post-install stages (indexinfo is one culprit).
r273096: Merge the following from ^/projects/release-vmimage: r273076, r273077, r273079, r273095:
r273076: Add a separate make(1) target to release/Makefile to build FreeBSD virtual machine disk images for use on the Microsoft Azure service.
For now, this target is not directly connected to the build, however can be manually invoked.
The 'vm-azure' target invokes {amd64,i386}/mk-azure.sh, which does the heavy lifting to produce proper VHDs. mk-azure.sh uses a configuration file, defaulting to tools/azure.conf if otherwise unset.
r273077: Clear VM_RC_LIST.
r273079: Fix signal list to trigger umount(8).
r273095: Output an informational message when mkimg(1) runs, so it does not appear that the process has stopped while waiting for a 'y/n' response when waagent is deprovisioned.
Relnotes: yes Approved by: re (delphij) Sponsored by: The FreeBSD Foundation
|
#
273101 |
|
14-Oct-2014 |
gjb |
MFstable10 r273080:
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.
Approved by: re (marius) Sponsored by: The FreeBSD Foundation
|
#
274104 |
|
04-Nov-2014 |
gjb |
MFstable10 r274102: MFC r274095: Fix VOLUME_LABEL when BRANCH contains '-' and '.' characters.
Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
|
#
273699 |
|
26-Oct-2014 |
gjb |
MFstable10 r273698: MFC r273653: Fix a few issues with creating VOLUME_LABEL for the installation ISOs:
- TYPE, BRANCH, and REVISION are only defined if OSRELEASE is not defined, so in situations where one might set OSRELEASE for an in-house ISO build, VOLUME_LABEL would be empty.
- makefs(8) limits the volume label to 32 characters, which for the powerpc64 case, OSRELEASE expands to FreeBSD-11.0-CURRENT-powerpc-powerpc64. Even with removing the prefixing 'FreeBSD-', the string is 30 characters long, leaving zero room for suffixing the type of ISO media (BO for bootonly, CD for cdrom, and DVD for dvdrom).
Resolve these by defining VOLUME_LABEL when defining OSRELEASE if unset. If OSRELEASE is defined by the builder, use the OSRELEASE from that definition as the VOLUME_LABEL.
In addition, for cases where both TARGET and TARGET_ARCH are used for the VOLUME_LABEL, use TARGET_ARCH if it differs from TARGET.
There are probably a few sharp edges here yet, but these problems are going to affect the powerpc/powerpc64 builds for 10.1-RELEASE, so the immediate concern is fixing the underlying problem at hand quickly, and less so about the elegance of the fix.
Approved by: re (kib) Sponsored by: The FreeBSD Foundation
|
#
273364 |
|
21-Oct-2014 |
gjb |
MFstable10 r273354: MFC r273204: Add more descriptive metadata to the ISO images.
MFstable10 r273355: Fix label for the UEFI bootonly cd.
PR: 165876 Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
|
#
273199 |
|
16-Oct-2014 |
gjb |
MFstable10 r273198: MFC r273093, r273096:
r273093: Merge the following from ^/projects/release-vmimage: r272436, r272437, r272792:
r272436: Remove the first argument to panic(), which was initially intended to be the exit code, however when a non-zero exit code was returned to release/Makefile, this would prevent any remaining (and possibly successful) stages from being attempted.
r272437:
If the vm-base target fails, prevent the vm-image target from being run since it cannot possibly succeed.
r272792:
Add /usr/local/bin and /usr/local/sbin to PATH, needed if third-party software needs to use utilities outside of the base system during post-install stages (indexinfo is one culprit).
r273096: Merge the following from ^/projects/release-vmimage: r273076, r273077, r273079, r273095:
r273076: Add a separate make(1) target to release/Makefile to build FreeBSD virtual machine disk images for use on the Microsoft Azure service.
For now, this target is not directly connected to the build, however can be manually invoked.
The 'vm-azure' target invokes {amd64,i386}/mk-azure.sh, which does the heavy lifting to produce proper VHDs. mk-azure.sh uses a configuration file, defaulting to tools/azure.conf if otherwise unset.
r273077: Clear VM_RC_LIST.
r273079: Fix signal list to trigger umount(8).
r273095: Output an informational message when mkimg(1) runs, so it does not appear that the process has stopped while waiting for a 'y/n' response when waagent is deprovisioned.
Relnotes: yes Approved by: re (delphij) Sponsored by: The FreeBSD Foundation
|
#
273101 |
|
14-Oct-2014 |
gjb |
MFstable10 r273080:
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.
Approved by: re (marius) Sponsored by: The FreeBSD Foundation
|