svn commit: r266665 - stable/9/release/scripts

[Glen Barber]

Author: gjb
Date: Sun May 25 18:07:23 2014
New Revision: 266665
URL: http://svnweb.freebsd.org/changeset/base/266665

Log:
  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

Modified:
  stable/9/release/scripts/FreeBSD_install_cdrom.conf
  stable/9/release/scripts/pkg-stage.sh
Directory Properties:
  stable/9/release/   (props changed)

Modified: stable/9/release/scripts/FreeBSD_install_cdrom.conf
==============================================================================
--- stable/9/release/scripts/FreeBSD_install_cdrom.conf	Sun May 25 18:06:32 2014	(r266664)
+++ stable/9/release/scripts/FreeBSD_install_cdrom.conf	Sun May 25 18:07:23 2014	(r266665)
@@ -10,3 +10,7 @@ FreeBSD_install_cdrom: {
   enabled: yes
 }
 
+FreeBSD: {
+  enabled: no
+}
+

Modified: stable/9/release/scripts/pkg-stage.sh
==============================================================================
--- stable/9/release/scripts/pkg-stage.sh	Sun May 25 18:06:32 2014	(r266664)
+++ stable/9/release/scripts/pkg-stage.sh	Sun May 25 18:07:23 2014	(r266665)
@@ -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}