#
272461 |
|
02-Oct-2014 |
gjb |
Copy stable/10@r272459 to releng/10.1 as part of the 10.1-RELEASE process.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
271943 |
|
22-Sep-2014 |
gjb |
MFC r271876: When populating the dvd/packages/ directory, create a symlink to All/pkg-*.txz in the Latest/ directory.
This allows 'pkg bootstrap' to work out-of-box if the REPOS_DIR environment is properly set.
Approved by: re (delphij) Sponsored by: The FreeBSD Foundation
|
#
271608 |
|
15-Sep-2014 |
gjb |
MFC r271480, r271483, r271491:
r271480: Set PKG_CACHEDIR to an 'All/' directory one level lower to fix 'pkg repo' generating repository metadata for the on-disc packages.
r271483: Fix duplicate PKG_ABI in the PKG_CACHEDIR path.
r271491: Simplify dvd package population with pkg-1.3.
Approved by: re (rodrigc) Sponsored by: The FreeBSD Foundation
|
#
266658 |
|
25-May-2014 |
gjb |
MFC r266553, r266554:
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.
Sponsored by: The FreeBSD Foundation
|
#
260781 |
|
16-Jan-2014 |
gjb |
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
|
#
259491 |
|
17-Dec-2013 |
gjb |
MFC 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.
Sponsored by: The FreeBSD Foundation
|
#
258952 |
|
04-Dec-2013 |
gjb |
MFC r258786, r258796, r258797, r258847, r258853, r258949:
r258786: Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise the textproc/docproj port build fails.
r258796 (hrs): - Prevent TARGET and TARGET_ARCH from being defined as empty when TARGET="" and/or TARGET_ARCH="" is specified. - Remove extra ().
r258797 (hrs): Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.
r258847: Provide reproducibility between builds by building pkg(8) from ports, instead of using pkg-bootstrap.
This should resolve a problem that was discovered during 10.0-BETA4 freebsd-update(8) builds,
r258853: Turn off the dvdrom target by default. dvd1.iso is now built by specifying 'WITH_DVD=1' during 'make release'.
This caused some problems during the freebsd-update builds for 10.0-BETA4.
r258949: Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating to true.
Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
|
#
258415 |
|
21-Nov-2013 |
gjb |
MFC r258305, r258307, r258308, r258309, r258310, r258314, r258317, r258319, r258320:
r258305: Use the IMAGES variable to determine which image files to remove as part of 'make -C /usr/src/release clean'.
r258307: Add a script and configuration files to fetch pre-built packages from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).
r258308: Unconditionally copy the build host /etc/resolv.conf into the chroot directory, since hostname resolution may be needed in the case of building a dvd image (with packages) and also setting 'NOPORTS=1'.
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.
Approved by: re (hrs) Sponsored by: The FreeBSD Foundation
|
#
258307 |
|
18-Nov-2013 |
gjb |
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).
Relevant updates to release/Makefile will follow.
Sponsored by: The FreeBSD Foundation
|