From 284a0c8006f802fc42ba227ed8563e8f9c2006ff Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 16 Jan 2014 16:12:09 +0000
Subject: 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
---
 release/pkg_repos/release-dvd.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 release/pkg_repos/release-dvd.conf

(limited to 'release/pkg_repos')

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
+}
-- 
cgit v1.1