summaryrefslogtreecommitdiffstats
path: root/release/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Clean up trailing whitespace in release/Makefile.gjb2014-04-011-4/+4
| | | | | | MFC after: 1 week X-MFC-With: r264027 Sponsored by: The FreeBSD Foundation
* Add a new release build variable, WITH_COMPRESSED_IMAGES.gjb2014-04-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | When set to a non-empty value, the installation medium is compressed with gzip(1) as part of the 'install' target in the release/ directory. With gzip(1) compression, downloadable image are reduced in size quite significantly. Build test against head@263927 shows the following: bootonly.iso: 64% smaller disc1.iso: 44% smaller memstick.img: 47% smaller mini-memstick.img: 65% smaller dvd1.iso: untested This option is off by default, I would eventually like to turn it on by default, and remove the '-k' flag to gzip(1) so only compressed images are published on FTP. Requested by: wkoszek MFC After: 1 week Sponsored by: The FreeBSD Foundation
* In release/Makefile, remove exclusion of CVS directories in thegjb2014-02-261-2/+2
| | | | | | | | | src/ and ports/ distributions. While I am thinking about it, exclude .git directories for src/ and ports/, as somewhat of a followup to r262499. Sponsored by: The FreeBSD Foundation
* etcupdate should use the src tree from where the release is built, notjhay2014-02-171-1/+1
| | | | | | the default (/usr/src) tree. MFC after: 2 weeks
* Update the pkg-stage target to be more compatible with pkg-1.2:gjb2014-01-161-3/+3
| | | | | | | | | | | | | | | | | | - Add a release-dvd.conf pkg(8) configuration file to override the default FreeBSD.conf configuration. - Remove architecture-specific pkg-stage.conf files, consolidate, and move their contents to scripts/pkg-stage.sh. - Use 'pkg -vv' to determine the ABI, which is used as the cache directory. Prior to these changes, it would be possible for pkg-stage to fetch conflicting binary packages from multiple repositories. Tested against: head@r260522, stable/10@r260522 MFC after: 3 days X-Insta-MFC: possibly Sponsored by: The FreeBSD Foundation
* Bootstrap etcupdate(8) as part of the release build, similargjb2013-12-221-0/+2
| | | | | | | | | to what is done for mergemaster(8). This allows etcupdate(8) to work out-of-box after the first upgrade of a system. Submitted by: jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Add a pkg(8) repository configuration file for cdrom-based packagegjb2013-12-151-0/+4
| | | | | | | | | | | installation. As part of the 'pkg-stage' target, copy the configuration file to the 'packages/repos/' directory on the DVD filesystem. MFC after: 3 days X-MFC-Before: -RC3 Sponsored by: The FreeBSD Foundation
* Reduce disc1.iso size by 74MB by removing lib32 libraries, sendmail,gjb2013-12-141-1/+1
| | | | | | | | and atf. MFC after: 3 days X-MFC-To-10: immediate (-RC2 requirement) Sponsored by: The FreeBSD Foundation
* Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluatinggjb2013-12-051-1/+1
| | | | | | | | | to true. Submitted by: hrs MFC after: 3 days X-MFC-to-10: immediate Sponsored by: The FreeBSD Foundation
* Turn off the dvdrom target by default. dvd1.iso is now built bygjb2013-12-021-2/+2
| | | | | | | | | | specifying 'WITH_DVD=1' during 'make release'. This caused some problems during the freebsd-update builds for 10.0-BETA4. MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.hrs2013-12-011-9/+5
|
* - Prevent TARGET and TARGET_ARCH from being defined as empty whenhrs2013-12-011-4/+8
| | | | | TARGET="" and/or TARGET_ARCH="" is specified. - Remove extra ().
* Add NOPKG to disable pkg-stage.hrs2013-11-301-1/+2
|
* Document the dvdrom target and NODVD variable, forgotten with r258310.gjb2013-11-271-0/+2
| | | | | MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.gjb2013-11-181-2/+1
| | | | | | | Requested by: hrs MFC after: 3 days X-MFC-With: r258310 Sponsored by: The FreeBSD Foundation
* Add the 'dvd1.iso' target. This mimics the 'release.iso' target,gjb2013-11-181-1/+35
| | | | | | | | | | | | | | | with the additional step of fetching packages for inclusion on the dvd image. The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if the '${TARGET}/pkg-stage.conf' configuration file exists (currently only amd64 and i386). Allow dvd1.iso to be skipped if NODVD=1. MFC after: 3 days X-MFC-With: r258305, r258307, r258308, r258309 Sponsored by: The FreeBSD Foundation
* Use the IMAGES variable to determine which image files to removegjb2013-11-181-1/+1
| | | | | | | as part of 'make -C /usr/src/release clean'. MFC after: 3 days Sponsored by: The FreeBSD Foundation
* Remove extra target from 'memstick' that I forgot to remove beforegjb2013-11-071-1/+1
| | | | | | | | | previous commit. MFC after: 1 week X-MFC-After: 10.0-RELEASE X-MFC-With: r257805 Sponsored by: The FreeBSD Foundation
* Add a 'mini-memstick.img' release target, which will use thegjb2013-11-071-1/+8
| | | | | | | | | | | | | | | | | '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. Prompted by: wblock MFC after: 1 week X-MFC-after: 10.0-RELEASE Sponsored by: The FreeBSD Foundation
* Reduce disc1.iso image size by installing the userland withgjb2013-10-131-1/+2
| | | | | | | | the WITHOUT_PROFILE=1 option set, trimming 56MB from the image. Approved by: re (glebius) MFC after: 1 week Sponsored by: The FreeBSD Foundation
* Remove BIND.des2013-09-301-2/+1
| | | | Approved by: re (gjb)
* For consistency with previous releases, name the cdrom installgjb2013-07-221-5/+6
| | | | | | | | | cd 'disc1.iso'. Discussed with: re@ team Approved by: kib (mentor) MFC after: 3 days X-MFC-To: stable/9 only
* Create memstick images with the '.img' filename extension.gjb2013-07-211-5/+6
| | | | | | | Requested by: many Approved by: kib (mentor) MFC after: 3 days X-MFC-To: stable/9 only
* Convert old make variable modifiers :U and :L to bmake :tu and :tl.tijl2013-06-021-2/+2
| | | | Reviewed by: sjg
* - Add CHECKSUM.* support in Makefile[1].hrs2013-02-031-3/+22
| | | | | | | | | | | | - Use ln -fs to create a symlink. - Remove pkgadd for docports. - Use WITHOUT_JADETEX=yes instead of WITH_JADETEX=no. - Add {WORLD,KERNEL}_FLAGS to [BTWK]MAKE. - Use makefs(8) and gpart(8) for sparc64 ISO image[2]. - Add publisher option to makefs(8)[2]. Based on work by: gjb[1] Discussed with: marius, nwhitehorn[2]
* Prevent including .zfs snapshot directories in the src.txzgjb2012-11-111-1/+1
| | | | | | | | | | distribution. This can happen if the src/ tree checkout is within its own ZFS dataset, and the 'snapdir' ZFS property is set to 'visible.' Approved by: hrs MFC after: 3 days X-MFC-To: stable/9 only
* Exclude potential circular symlinkemaste2012-10-151-1/+1
| | | | | This does not occur with normal release builds but can happen when reusing these release parts for other purposes.
OpenPOWER on IntegriCloud