From owner-svn-src-all@FreeBSD.ORG Sun May 25 18:07:26 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C9C3782; Sun, 25 May 2014 18:07:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FBB02433; Sun, 25 May 2014 18:07:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PI7OpF086057; Sun, 25 May 2014 18:07:24 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PI7OdZ086055; Sun, 25 May 2014 18:07:24 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201405251807.s4PI7OdZ086055@svn.freebsd.org> From: Glen Barber Date: Sun, 25 May 2014 18:07:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r266665 - stable/9/release/scripts X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 18:07:26 -0000 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}