From 6a614ba61b3c9b728ad98a53ada651387dac4d00 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 25 May 2014 18:07:23 +0000
Subject: [PATCH] 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.

Approved by:	re (marius)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/stable/9@266665 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/scripts/FreeBSD_install_cdrom.conf | 4 ++++
 release/scripts/pkg-stage.sh               | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/release/scripts/FreeBSD_install_cdrom.conf b/release/scripts/FreeBSD_install_cdrom.conf
index 44554b114..7a6d7878a 100644
--- a/release/scripts/FreeBSD_install_cdrom.conf
+++ b/release/scripts/FreeBSD_install_cdrom.conf
@@ -10,3 +10,7 @@ FreeBSD_install_cdrom: {
   enabled: yes
 }
 
+FreeBSD: {
+  enabled: no
+}
+
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 2281435af..6d02ac630 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -5,7 +5,7 @@
 
 set -e
 
-export ASSUME_ALWAYS_YES=1
+export ASSUME_ALWAYS_YES="YES"
 export PKG_DBDIR="/tmp/pkg"
 export PERMISSIVE="YES"
 export REPO_AUTOUPDATE="NO"
@@ -40,7 +40,10 @@ if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
-export PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
+PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
+PKG_ABI="${PKG_ABI%\";}"
+PKG_ABI="${PKG_ABI#\"}"
+export PKG_ABI
 export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
 
 /bin/mkdir -p ${PKG_CACHEDIR}
-- 
2.45.0