summaryrefslogtreecommitdiffstats
path: root/release/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* MFS11 r320753:gjb2017-07-071-1/+1
| | | | | | | | | MFC r320748: Allow passing NOPKG= to make(1) to enable the pkg-stage target from getting executed when NOPKG is defined but empty. Approved by: re (kib) Sponsored by: The FreeBSD Foundation
* MFC r318646:gjb2017-05-251-1/+1
| | | | | | | Allow PORTSDIR to be overridden in the pkg-stage target. PR: 218393 Sponsored by: The FreeBSD Foundation
* MFC r303003:gjb2016-07-211-0/+3
| | | | | | | | Make sure we clean up the rdoc and reldoc directories if NODOC is not set. Approved by: re (kib) Sponsored by: The FreeBSD Foundation
* Reduce the disc1.iso size from 850+M to just over 650M.gjb2016-07-191-3/+4
| | | | | | | | | | | | | | | As a result of this change, the 'kernel-dbg.txz' distribution is no longer provided on disc1.iso, and deselected by default in bsdinstall(8). When 'kernel-dbg.txz' is selected, network configuration happens before the installer proceeds, to fetch the distribution from the mirrors. This is a direct commit to stable/11, as there is intention to solve this differently for 12.0-RELEASE. Reviewed by: nwhitehorn (glanced at) Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
* Remove the 'debug.witness.trace' entry, as WITNESS is notgjb2016-07-141-3/+0
| | | | | | | | | enabled on stable branches by default. This is a direct commit to stable/11. Approved by: re (kib) Sponsored by: The FreeBSD Foundation
* Remove vestigial cloudware-install bits missed in r300767.gjb2016-05-261-1/+1
| | | | Sponsored by: The FreeBSD Foundation
* Remove misspelled and redundant MK_INSTALLIB=no.bdrewery2016-04-131-1/+1
|
* Add a new target to touch the ${.OBJDIR}/release file, whichgjb2016-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
* Merge ^/projects/release-install-debug:gjb2016-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
* Fix path to include .OBJDIR to avoid polluting the sourcegjb2016-01-041-1/+1
| | | | | | | tree during 'make release'. MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Deprecate MD5 checksum generation in favor of SHA512.gjb2015-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
* Whitespace alignmentdteske2015-09-111-1/+1
| | | | | | MFC after: 3 weeks X-MFC-to: stable/10 X-MFC-with: 287696
* The <arch>/mkisoimages.sh script in release knows how to adddteske2015-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
* Add 'cloudware-install' target to handle copying cloudgjb2015-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
* release: use xz via pipe when compressing the tarballs.rpaulo2015-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
* Revert r278445.gjb2015-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
* Enable multi-threaded xz(1) compression, after r278433.gjb2015-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
* Define FREEBSD_VERSION in release/Makefile, derivedgjb2015-02-091-0/+4
| | | | | | from sys/sys/param.h. Sponsored by: The FreeBSD Foundation
* Rename the 'system' target to 'disc1', which is specificgjb2015-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
* Provide a recipe of "true" for building the "release" target once itscperciva2015-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
* Rename the 'release' target to 'real-release', andgjb2015-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
*---. Merge the following revisions from ^/projects/release-vmimage:gjb2015-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
| | | * Reintegrate head revisions r273096-r277147gjb2015-01-131-3/+12
| | | |\ | | |/ / | |_| / |/| | Sponsored by: The FreeBSD Foundation
| | * Add glue to allow enabling building cloud providergjb2014-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
| * Move virtual machine / cloud provider targets andgjb2014-10-291-50/+1
| | | | | | | | | | | | options from release/Makefile to their own Makefile. Sponsored by: The FreeBSD Foundation
* | Use the correct loader.conf(5) entry for deferring thegjb2014-12-301-3/+3
| | | | | | | | | | | | | | mountroot prompt. Prodded by: ian Sponsored by: The FreeBSD Foundation
* | Delay dropping to the mountroot prompt for 10 secondsgjb2014-12-291-0/+3
| | | | | | | | | | | | in case the root device is not yet ready. Sponsored by: The FreeBSD Foundation
* | Fix VOLUME_LABEL when BRANCH contains non-alphagjb2014-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
* | Fix a few issues with creating VOLUME_LABEL for thegjb2014-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
* | Add more descriptive metadata to the ISO images.gjb2014-10-171-3/+5
|/ | | | | | | | PR: 146079 Submitted by: Roman Bogorodskiy MFC after: 3 days X-MFC-10.1: yes Sponsored by: The FreeBSD Foundation
* Add a separate make(1) target to release/Makefile togjb2014-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
* Remove two stray comments added during the initial iterationsgjb2014-10-021-2/+2
| | | | | | of testing, no longer needed. Sponsored by: The FreeBSD Foundation
* Add WITH_COMPRESSED_VMIMAGES variable, which when set enablesgjb2014-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
* After evaluating WITH_VMIMAGES is non-empty, ensuregjb2014-10-011-2/+6
| | | | | | the mk-vmimage.sh script exists before running it. Sponsored by: The FreeBSD Foundation
* Avoid using env(1) to set values passed to mk-vmimage.sh,gjb2014-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
* Separate release/scripts/mk-vmimage.sh to machine-specificgjb2014-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
* release/Makefile:gjb2014-09-281-1/+2
| | | | | | | | | Include .OBJDIR in DESTDIR in the vm-base target. release/release.sh: Provide the full path to mddev. Sponsored by: The FreeBSD Foundation
* release/Makefile:gjb2014-09-281-0/+3
| | | | | | | | | | | | | | | Connect the virtual machine image build to the release target if WITH_VMIMAGES is set to a non-empty value. release/release.sh: Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS. release/release.conf.sample: Add commented entries for tuning the release build if the WITH_VMIMAGES make(1) environment variable is set to a non-empty value. Sponsored by: The FreeBSD Foundation
* Use VMBASE in place of a hard-coded filename in the CLEANFILES list.gjb2014-09-281-1/+1
| | | | Sponsored by: The FreeBSD Foundation
* Initial commit to include virtual machine images as partgjb2014-09-281-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Sponsored by: The FreeBSD Foundation
* Merge ^/projects/release-debugdist into ^/head:gjb2014-07-011-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r262491, r262493, r262516, r267345, r267397: r262491: Add DEBUG_DISTRIBUTIONS, and set it to include base and EXTRA_DISTRIBUTIONS, excluding 'doc', since the documentation distribution does not have corresponding debug information. Use DEBUG_DISTRIBUTIONS in the 'distributeworld installworld' and 'packageworld' targets, to reduce the number of occurances of excluding distributions that do not have .debug files. r262493: In release/Makefile, explicitly set WITHOUT_DEBUG_FILES=1 for dvdrom and cdrom targets. (Later reverted.) Exclude the *.debug.txz distributions from dvdrom and cdrom images, but include them for ftp distribution. r262516: Rename ${dist}.debug.txz to ${dist}-dbg.txz to prevent the following output: eval: ${base....}: Bad substitution eval: ${doc....}: Bad substitution eval: ${games....}: Bad substitution eval: ${lib32....}: Bad substitution This also follows other naming conventions seen in the wild. r267345: Explicitly set MK_DEBUG_FILES=no, which overrides the WITH_DEBUG_FILES=1 and WITHOUT_DEBUG_FILES=1 collisions previously experienced. This change allows us to create the {base,kernel}_debug.txz distributions without accidentally installing the *.debug files on the medium itself. r267397: Remove evaluations of MK_DEBUG_FILES where not needed. If DEBUG_DISTRIBUTIONS is empty, which is true if MK_DEBUG_FILES evaluates to 'no' above, the loop does nothing. MFC after: 1 month Tested on: head@r267801 Reviewed by: brooks [1], emaste, imp [1] [1] earlier version Sponsored by: The FreeBSD Foundation
* Switch release/Makefile knobs from WITHOUT_FOO=1 to MK_FOO=no.gjb2014-06-141-9/+9
| | | | | | | | | | | | | | | This allows greater granular control over the release build, and avoids WITH_FOO=1 and WITHOUT_FOO=1 collision. This change was verified to produce correct results compared to an earlier build by diffing find(1) output of the resulting bootonly/, dvd/, and release/ directories. Tested on: head@r267449 MFC after: 1 month X-MFC-Note: Requires commits not yet MFC'd, so likely longer than 1 month. Sponsored by: The FreeBSD Foundation
* Strip out the test suite from the installation media.jmmv2014-06-101-3/+4
| | | | | | This affects the disc1.iso, dvd1.iso and bootonly.iso files. Obtained from: gjb
* Fix indentation level.gjb2014-06-101-2/+2
| | | | | | MFC after: 3 days X-MFC-With: r267326 Sponsored by: The FreeBSD Foundation
* Add empty pkg-stage file to CLEANFILES if WITH_DVD=1.gjb2014-06-101-0/+3
| | | | | MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Turn off the full witness trace on console output.gjb2014-04-271-0/+3
| | | | | | | | | | | | | On head/, or more specifically, when WITNESS is in the kernel config, the console is spammed excessively with lock order reversal between isofs and devfs. Set debug.witness.trace=0 in the installer sysctl.conf to avoid printing the full KDB stack backtrace. This does not prevent printing the lock order reversal has happened, only lessens the console spam. Sponsored by: The FreeBSD Foundation
* Allow overriding xz(1) path.gjb2014-04-031-1/+2
| | | | | | | Requested by: marck MFC After: 5 days X-MFC-With: r264027,r264028,r264029,r264030,r264046 Sponsored by: The FreeBSD Foundation
* Use xz(1) instead of gzip(1) to compress release imagesgjb2014-04-021-3/+3
| | | | | | | | | when WITH_COMPRESSED_IMAGES is used. Requested by: delphij, brooks, Nikolai Lifanov MFC After: 1 week X-MFC-With: r264027,r264028,r264029,r264030 Sponsored by: The FreeBSD Foundation
* If WITH_COMPRESSED_IMAGES is set, add the compressed images togjb2014-04-011-0/+5
| | | | | | | | the CLEANFILES list. MFC after: 1 week X-MFC-With: r264027,r264028,r264029 Sponsored by: The FreeBSD Foundation
* Fix logic error: s/||/&&/gjb2014-04-011-1/+1
| | | | | | | Pointyhat: gjb MFC after: 1 week X-MFC-With: r264027,r264028 Sponsored by: The FreeBSD Foundation
OpenPOWER on IntegriCloud