diff options
author | gjb <gjb@FreeBSD.org> | 2014-01-16 16:12:09 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2014-01-16 16:12:09 +0000 |
commit | 284a0c8006f802fc42ba227ed8563e8f9c2006ff (patch) | |
tree | 019dcbce72e570d3c9b754409132650b3cfbfb86 /release/pkg_repos | |
parent | 0d4d14c84bf3afff3dabf8bfd5c92310a76f0c89 (diff) | |
download | FreeBSD-src-284a0c8006f802fc42ba227ed8563e8f9c2006ff.zip FreeBSD-src-284a0c8006f802fc42ba227ed8563e8f9c2006ff.tar.gz |
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
MFC after: 3 days
X-Insta-MFC: possibly
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/pkg_repos')
-rw-r--r-- | release/pkg_repos/release-dvd.conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf new file mode 100644 index 0000000..9541359 --- /dev/null +++ b/release/pkg_repos/release-dvd.conf @@ -0,0 +1,8 @@ +# $FreeBSD$ +release: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} |