FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=release%2F9.3.0 2014-06-23T19:37:11Z 2014-06-23T19:37:11Z Glen Barber gjb@FreeBSD.org 2014-06-23T19:37:11Z urn:sha1:3318ba1c74dd2d37b9cc54867693755721cfec10 9.3-RELEASE, so include XFCE4 on the DVD in its place. This is a direct commit to releng/9.3. Approved by: re (marius) Sponsored by: The FreeBSD Foundation 2014-05-25T18:07:23Z Glen Barber gjb@FreeBSD.org 2014-05-25T18:07:23Z urn:sha1:d397d5fe5ebb2c028769f1bcdbb3ca55d1d30a07 r266553: Add forward-compatibility glue with pkg-1.3: - Use ASSUME_ALWAYS_YES=YES instead of ASSUME_ALWAYS_YES=1 since pkg-1.3 expects "yes" or "true" values. - Before exporting PKG_ABI, strip extra characters from what is parsed from 'pkg -vv'. This causes problems further down when creating the packages directory for inclusion on the dvd1.iso. Previously PKG_ABI would be 'freebsd:9:x86:64', but now is '"freebsd:9:x86:64";' in pkg-1.3. r266554: Disable the main FreeBSD pkg(7) repositories in the dvd repository configuration to avoid fetching from upstream in case there may be conflicts. Approved by: re (marius) Sponsored by: The FreeBSD Foundation 2014-03-07T00:38:29Z Glen Barber gjb@FreeBSD.org 2014-03-07T00:38:29Z urn:sha1:e5c17b12e2068aff32e4c380ad73b47aadd9da8b Update the pkg-stage target to be more compatible with pkg-1.2: - 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. NOTE: WITH_DVD=1 is broken on stable/9, pending updates to the pkg(7) code. The 'dvdrom' target on stable/9 is broken as-is, so there is no harm merging this change now. I think. Sponsored by: The FreeBSD Foundation 2014-03-07T00:28:11Z Glen Barber gjb@FreeBSD.org 2014-03-07T00:28:11Z urn:sha1:fe6594373c7a065dbbfa7b2dd621b8f129814379 r258305: Use the IMAGES variable to determine which image files to remove as part of 'make -C /usr/src/release clean'. r258770 (hrs): Add NOPKG to disable pkg-stage. r259400: Reduce disc1.iso size by 74MB by removing lib32 libraries, sendmail, and atf. r259426: Add a pkg(8) repository configuration file for cdrom-based package installation. As part of the 'pkg-stage' target, copy the configuration file to the 'packages/repos/' directory on the DVD filesystem. Sponsored by: The FreeBSD Foundation 2013-12-18T00:07:52Z Glen Barber gjb@FreeBSD.org 2013-12-18T00:07:52Z urn:sha1:bd2d6058dfd65786cf2afc928b1e1dbc7431eab0 r258317, r258319, r258320, r258669, r258786, r258853, r258949, r259079, r259246: r254224: Update the wrapper script to 'release.sh', as used by the FreeBSD Release Engineering Team as of 9.2-RELEASE. Document that a cross-build release is possible by setting the TARGET and TARGET_ARCH variables. Include an example of using release.sh with and without the optional configuration file. Document the supported release.sh configuration file variables. Update the 'cdrom' target output file to disc1.iso. Update the 'memstick' target output file to memstick.img. Add attributions for the last major updates to this manual page. Fix some mdoc(7) style nits. r254294: Remove the defaults for TARGET/TARGET_ARCH. Note that WORLD_FLAGS and KERNEL_FLAGS set the number of make(1) jobs only on SMP-capable systems. r254328: Remove the {SRC,DOC,PORT}REVISION variables from release(7), and update the default {SRC,DOC,PORT}BRANCH defaults. r258307: Add a script and configuration files to fetch pre-built packages from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso). The script sources ${.CURDIR}/${TARGET}/pkg-stage.conf, which sets several environment variables, such as the pkg(8) ABI, PACKAGESITE, PKG_DBDIR, and PKG_CACHEDIR. PKG_CACHEDIR is set to the directory on the release medium used by bsdconfig(8) (/packages/${ABI}). ABI is determined by output of 'make -C /usr/src/release -V REVISION'. See pkg.conf(5) for descripton on other variables set here. The list of packages to include are set within the configuration file. The script and configuration files are intended to be run by the 'make dvd' target within the release directory, and assume the release is built within a chroot environment (such as by using release.sh). r258309: Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/' in preparation of adding a 'dvd1.iso' target. r258310: Add the 'dvd1.iso' target. This mimics the 'release.iso' target, 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. r258314: Fix how ABI is evaluated so it matches more than a dot-zero case. r258317: Document the 'dvdrom' target. r258319: Remove WITHOUT_PROFILE=1 for the dvd1.iso medium. r258320: Simplify PKG_ABI for pkg-stage.sh. r258669: Document the dvdrom target and NODVD variable. r258786: Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise the textproc/docproj port build fails. r258853: Turn off the dvdrom target by default. dvd1.iso is now built by specifying 'WITH_DVD=1' during 'make release'. r258949: Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating to true. r259079: Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually passed to 'make release'. r259246: Prevent release build errors found during snapshot builds where if NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if WITH_DVD=1. Tested against: stable/9@r259512 Sponsored by: The FreeBSD Foundation 2013-07-24T13:43:09Z Glen Barber gjb@FreeBSD.org 2013-07-24T13:43:09Z urn:sha1:2bd77ad6d451614cb67cdb8260d6392005ed27e2 o Update the perl package version to 5.14. o Add devel/subversion and devel/subversion-static so we provide a package for source-based users to check out the various trees, both with and without extra dependencies. This is a direct commit to stable/9. Approved by: kib (mentor) Approved by: re (glebius) 2012-01-04T19:38:35Z Ken Smith kensmith@FreeBSD.org 2012-01-04T19:38:35Z urn:sha1:f862deea5e29c8ef255221cff8454d214402d1ee worked out a bit late so this won't make it into releng/9.0 or release/9.0.0 but it's worth committing to stable/9 for reference when 9.1-RELEASE rolls around. The new installer doesn't handle installing packages itself like sysinstall had done so in that respect packages are no longer as closely tied to doing an install. We'll provide a "disc1" image that has no packages on it at all. For the "dvd1" image there will be a /packages directory with the set of pre-built packages generated by this script (and all the dependencies of these packages...). The idea is to provide enough packages on the DVD for a user to get a minimal graphical workstation installed without needing to do a network based install if their network link is so-so... Discussed with: portmgr, re 2011-03-13T17:15:31Z Nathan Whitehorn nwhitehorn@FreeBSD.org 2011-03-13T17:15:31Z urn:sha1:b70047d4136285ce8e5046c379143f4813228855 well as package descriptions and add code in the installer to check the checksums. 2011-03-13T01:38:24Z Nathan Whitehorn nwhitehorn@FreeBSD.org 2011-03-13T01:38:24Z urn:sha1:89033280b7a84e2b536882c9fc39c6a922cd3d02 i386 and amd64. This involved moving the memstick generation script to the arch directories from scripts/, in analogy to mkisoimages.sh. This script was never called from /usr/src/release/Makefile, so that hasn't been updated. 2011-03-02T14:39:26Z Nathan Whitehorn nwhitehorn@FreeBSD.org 2011-03-02T14:39:26Z urn:sha1:99ad39c822aa9bfa14167e101fce67e6d996dd42 infrastructure to use it. make distributeworld can now be used without preparing its environment first and installs games into its distribution using the regular make distribute logic instead of post-processing with a script. Also add two new targets, packageworld and packagekernel, that tar up the results of distributeworld and distributekernel (also new), respectively.