Commit Graph

3 Commits

Author SHA1 Message Date
Marius Strobl
43616ffe4d - Reset stable/10 back to -PRERELEASE status now that releng/10.4
has been branched.
- Update __FreeBSD_version to reflect the new -STABLE branch.
- Switch the pkg(8) configuration for the default installation and the
  DVD image creation back to the latest set, i. e. revert r322737.

Approved by:	re (implicit)
2017-09-15 00:32:22 +00:00
Marius Strobl
0f24f47a1b Switch the pkg(8) configuration for the default installation and the
dvd1.iso to use the quarterly set, i. e. 2017Q3, during the 10.4-BETA
phase.

Approved by:	re (implicit)
2017-08-20 21:21:46 +00:00
Glen Barber
78b50aa79f MFC r260772:
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.

Tested against:	head@r260522, stable/10@r260522

Sponsored by:	The FreeBSD Foundation
2014-01-16 16:44:23 +00:00