aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* release: don't checksum images if there are noneMitchell Horne2020-12-081-0/+2
| | | | | | | | | | For platforms that don't have any of the memstick, cdrom, or dvdrom release images (i.e. riscv64), the release-install target will trip up when invoking md5(1) on the non-existent image files. Skipping this allows the install to complete successfully. Notes: svn path=/head/; revision=368424
* Makefile.inc1:Glen Barber2020-07-161-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | - New file. Adds logic to search for the git binary, as well as determining the branch and revision, used in various places. Makefile: - Remove searching for the svn{,lite} binary. Makefile.ec2: - Reduce duplicated code, removing searching for the svn{,lite} binary, in addition to EC2_SVN{BRANCH,REV}. - Rename EC2_SVN* with GIT* for consistency. Makefile.mirrors: - Remove the SRCBRANCH declaration, replaced with the exported GITBRANCH variable. - Update _SNAP_SUFFIX from SVNREVISION to GITREV, and remove the leading 'r' from it, since it will break git hashes. - Remove yet another instance of duplicated code to search for the svn{,version}lite binary. Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/projects/release-git/; revision=363258
* retire amd(8)Ed Maste2020-03-091-2/+2
| | | | | | | | | | | | | | autofs was introduced with FreeBSD 10.1 and is the supported method for automounting filesystems. As of r296194 the amd man page claimed that it is deprecated. Remove it from base now; the sysutils/am-utils port is still available if necessary. Discussed with: cy Relnotes: Yes Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=358821
* Fix a typo.Glen Barber2020-01-131-1/+1
| | | | | | | | MFC after: 3 days Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/head/; revision=356686
* Remove setting of long-unused MK_NCP optionEd Maste2018-12-201-2/+2
| | | | | | | | | | | NCP was removed from the tree in 2013 (r248097) and disconnected some time before. Reported by: bz Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=342279
* Pass _BRANCH in the reldoc target to ensure the correctGlen Barber2018-10-291-0/+1
| | | | | | | | | | | | src branch is used when generating the hardware.html page. MFC after: 3 days MFC before: 12.0-BETA3 MFC with: r339873 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=339875
* Add debug.witness.trace=0 back to the installer sysctl.conf(5),Glen Barber2018-10-231-0/+3
| | | | | | | | | | | incorrectly removed from head when it should have been removed from stable/12 post-branch. Reported by: bdrewery Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=339657
* - Update head to 13.0-CURRENT.Glen Barber2018-10-191-3/+0
| | | | | | | | | | | | | | - Bump MACHINE_TRIPLE, TARGET_TRIPLE, FBSD_MAJOR, FBSD_CC_VER, FREEBSD_CC_VERSION, OS_VERSION. - Update comment in UPDATING regarding debugging options. - Remove debug.witness.trace=0 from installation media. - Bump __FreeBSD_version. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=339436
* Disable kernels_autodetect on installation mediaKyle Evans2018-10-111-0/+3
| | | | | | | | | | | This feature is disabled on install media as these generally won't have any interesting kernels to be listed other than the default kernel, so the potential performance penalty in these situations likely isn't worth it. Approved by: re (kib) Notes: svn path=/head/; revision=339309
* Fix the hardware.{txt,html} build in the release/Makefile 'reldoc'Glen Barber2018-10-041-0/+10
| | | | | | | | | | | | | | | | | | | | target. The doc/share/mk/doc.commands.mk sets SVN to /usr/local/bin/svn by default, which is not necessarily installed by the documentation project textproc/docproj port. Ensure SVN can be evaluated properly to include the hardware pages by iterating through /usr/local/bin and /usr/bin and looking for both svn and svnlite binaries, and pass the SVN variable explicitly through env(1) in the reldoc target to avoid failures if it does not exist. Approved by: re (rgrimes) Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=339175
* build: skip the database check when generating install mediaRoger Pau Monné2018-08-171-3/+6
| | | | | | | | | | | | | | | There are several scripts and targets solely used to generate install media, make sure DB_FROM_SRC is used in that case in order to prevent checking the host database, which is irrelevant when generating install binaries. Sponsored by: Citrix Systems R&D PR: 230459 Reviewed by: gjb Differential revision: https://reviews.freebsd.org/D16638 Notes: svn path=/head/; revision=337960
* Fix the reldoc target in release/Makefile following doc commit r51264.Glen Barber2017-12-071-8/+10
| | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=326667
* Run mm-mtree with whatever -j value the build is using.Bryan Drewery2017-10-311-1/+2
| | | | | | | | | Reviewed by: gjb Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12807 Notes: svn path=/head/; revision=325179
* Fix the 'reldoc' target, following doc commit r51047.Glen Barber2017-10-051-4/+8
| | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=324331
* Allow passing NOPKG= to make(1) to prevent the pkg-stage targetGlen Barber2017-07-061-1/+1
| | | | | | | | | | from getting executed. MFC after: 3 days Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=320748
* Remove groff from baseBaptiste Daroussin2017-06-071-1/+1
| | | | | | | | | | | | | All manpages in base are now compatible with mandoc(1), all roff documentation will be relocated in the doc tree. man(1) can now use groff from the ports tree if it needs. Also remove checknr(1) and colcrt(1) which are only useful with groff. Approved by: (no objections on the mailing lists) Notes: svn path=/head/; revision=319664
* Allow PORTSDIR to be overridden in the pkg-stage target.Glen Barber2017-05-221-1/+1
| | | | | | | | | | Submitted by: Johannes Jost Meixner (original) PR: 218393 MFC after: 3 days Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=318646
* Make sure we clean up the rdoc and reldoc directories if NODOCGlen Barber2016-07-181-0/+3
| | | | | | | | | | is not set. MFC after: 3 days Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=303003
* Reduce the set of things on the disc1 image to those on the bootonly image.Nathan Whitehorn2016-07-131-3/+5
| | | | | | | | | | Notably, this removes the toolchain from the CD-ROM image (it remains on DVD images) and pushes the CD-ROM image well below the 700 MB mark. MFC after: 10 days Notes: svn path=/head/; revision=302691
* Remove vestigial cloudware-install bits missed in r300767.Glen Barber2016-05-261-1/+1
| | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=300776
* Remove misspelled and redundant MK_INSTALLIB=no.Bryan Drewery2016-04-131-1/+1
| | | | Notes: svn path=/head/; revision=297938
* Add a new target to touch the ${.OBJDIR}/release file, whichGlen Barber2016-01-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | indicates the 'release' target has run (in order to prevent subsequent invocations that may clobber original build output). As is, the 'release' target is a dummy target that does nothing more than depend on subsequent targets. Unless 'make obj' is invoked prior to 'make release', .OBJDIR and .CURDIR will always be '/usr/src/release' (or wherever /usr/src is located). When 'make release' invokes 'make real-release' (and subsequent targets), .OBJDIR is not updated, which still leads to src/ tree pollution. While arguably a hack, 'make release' will invoke the original dummy targets as originally intended, but instead of touching an empty file (or returing @true), will call a 'release-done' target that will trigger the behavior that was intended to prevent a subsequent invocation. Discussed with: hrs MFC after: 3 days X-MFC-With: r293173 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=293231
* Merge ^/projects/release-install-debug:Glen Barber2016-01-051-2/+2
| | | | | | | | | | | | | | | - Rework MANIFEST generation and parsing via bsdinstall(8). - Allow selecting debugging distribution sets during install. - Rework bsdinstall(8) to fetch remote debug distribution sets when they are not available on the local install medium. - Allow selecting additional non-GENERIC kernels during install. At present, GENERIC is still required, and installed by default. Tested with: head@r293203 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=293223
* Fix path to include .OBJDIR to avoid polluting the sourceGlen Barber2016-01-041-1/+1
| | | | | | | | | | tree during 'make release'. MFC after: 3 days Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=293173
* Deprecate MD5 checksum generation in favor of SHA512.Glen Barber2015-10-141-1/+1
| | | | | | | | | | | | | This was discussed during the 10.2-RELEASE cycle, however since we were nearing the end of the cycle, we decided to defer this change until after 10.2-RELEASE. Reminded by: so (delphij), jmg MFC after: 5 days Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=289337
* Whitespace alignmentDevin Teske2015-09-111-1/+1
| | | | | | | | | MFC after: 3 weeks X-MFC-to: stable/10 X-MFC-with: 287696 Notes: svn path=/head/; revision=287697
* The <arch>/mkisoimages.sh script in release knows how to addDevin Teske2015-09-111-3/+4
| | | | | | | | | | | | | | extra bits from an "xtra-bits-dir". This feature is unusable from release/Makefile. Add an XTRADIR setting to use it. Differential Revision: https://reviews.freebsd.org/D3633 Reviewed by: kmacy MFC after: 3 weeks X-MFC-to: stable/10 Relnotes: yes Notes: svn path=/head/; revision=287696
* Add 'cloudware-install' target to handle copying cloudGlen Barber2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | disk images to a directory within DESTDIR. Add CLOUDINSTALL variable to automatically generate the actual list of install targets. While here, rename the cloud-specific names from 'vm-' to 'cw-' to avoid naming collisions. Add AZURE_DISK, GCE_DISK, and OPENSTACK_DISK output file variables. Add 'cloudware-install' to the 'install' target. MFC after: 1 week Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=279249
* release: use xz via pipe when compressing the tarballs.Rui Paulo2015-02-171-20/+7
| | | | | | | | | | | | | | | | | libarchive(3) doesn't support the new liblzma API yet, but this change allows us to enable multi-threaded xz compression. ``make release'' should now finish in half the time on a machine with several cores and fast disks (our typical build server). This behaviour only applies when building a release and it doesn't affect buildworld/installworld. To disable threaded xz compression, set XZ_THREADS=1. Reviewed by: gjb Tested by: gjb Notes: svn path=/head/; revision=278926
* Revert r278445.Glen Barber2015-02-091-4/+0
| | | | | | | | | | | | I was going to use __FreeBSD_version to determine if xz(1) should be multi-threaded by default, but doing this will cause problems if/when the changes are merged from head. Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=278450
* Enable multi-threaded xz(1) compression, after r278433.Glen Barber2015-02-091-1/+15
| | | | | | | | | | | | | Allow multi-threaded xz(1) to be turned off by specifying NO_XZTHREADS, and allow number of threads to be overridden by specifying XZ_THREADS=N. MFC after: 1 week X-MFC-needs: r278433 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=278449
* Define FREEBSD_VERSION in release/Makefile, derivedGlen Barber2015-02-091-0/+4
| | | | | | | | | from sys/sys/param.h. Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=278445
* Rename the 'system' target to 'disc1', which is specificGlen Barber2015-01-281-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Tested with: head@r277834 MFC after: 3 weeks X-MFC-with: r277458, r277536, r277606, r277609 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=277836
* Provide a recipe of "true" for building the "release" target once itsColin Percival2015-01-231-0/+1
| | | | | | | | | | prerequisites are satisfied, in order to avoid having an implicit rule triggered by the presence of release.sh. Approved by: gjb Notes: svn path=/head/; revision=277606
* Rename the 'release' target to 'real-release', andGlen Barber2015-01-221-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. [1] 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. Reported by: cperciva [1] MFC after: 1 month X-MFC-with: r277458 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=277536
* Merge the following revisions from ^/projects/release-vmimage:Glen Barber2015-01-201-71/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=277458
| * Reintegrate head revisions r273096-r277147Glen Barber2015-01-131-3/+12
| |\ | |/ |/| | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=277148
| * Add glue to allow enabling building cloud providerGlen Barber2014-10-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VM images by default. When WITH_CLOUDWARE is not empty, add CLOUDTARGETS to the release/Makefile 'release' target. CLOUDTARGETS is generated from the contents of CLOUDWARE, which should be a list of all supported target providers. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=273824
| * Move virtual machine / cloud provider targets andGlen Barber2014-10-291-50/+1
| | | | | | | | | | | | | | | | | | options from release/Makefile to their own Makefile. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=273823
* | Use the correct loader.conf(5) entry for deferring theGlen Barber2014-12-301-3/+3
| | | | | | | | | | | | | | | | | | | | mountroot prompt. Prodded by: ian Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=276400
* | Delay dropping to the mountroot prompt for 10 secondsGlen Barber2014-12-291-0/+3
| | | | | | | | | | | | | | | | | | in case the root device is not yet ready. Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=276383
* | Fix VOLUME_LABEL when BRANCH contains non-alphaGlen Barber2014-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | characters, in particular '-' and '.'. Submitted by: des Tested by: des MFC after: 3 days X-MFC-10.1: yes Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=274095
* | Fix a few issues with creating VOLUME_LABEL for theGlen Barber2014-10-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. MFC after: 3 days X-MFC-10.1: yes, asap Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=273653
* | Add more descriptive metadata to the ISO images.Glen Barber2014-10-171-3/+5
|/ | | | | | | | | | | PR: 146079 Submitted by: Roman Bogorodskiy MFC after: 3 days X-MFC-10.1: yes Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=273204
* Add a separate make(1) target to release/Makefile toGlen Barber2014-10-141-0/+15
| | | | | | | | | | | | | | | | | | 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. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=273076
* Remove two stray comments added during the initial iterationsGlen Barber2014-10-021-2/+2
| | | | | | | | | of testing, no longer needed. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=272413
* Add WITH_COMPRESSED_VMIMAGES variable, which when set enablesGlen Barber2014-10-021-1/+3
| | | | | | | | | | | | | 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. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=272392
* After evaluating WITH_VMIMAGES is non-empty, ensureGlen Barber2014-10-011-2/+6
| | | | | | | | | the mk-vmimage.sh script exists before running it. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=272381
* Avoid using env(1) to set values passed to mk-vmimage.sh,Glen Barber2014-10-011-8/+6
| | | | | | | | | | | | 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. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=272380
* Separate release/scripts/mk-vmimage.sh to machine-specificGlen Barber2014-10-011-2/+2
| | | | | | | | | | | | | | 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. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-vmimage/; revision=272376