From owner-svn-src-all@FreeBSD.ORG Fri May 23 15:19:43 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 C8EC321F; Fri, 23 May 2014 15:19:43 +0000 (UTC) Received: from i3mail.icecube.wisc.edu (i3mail.icecube.wisc.edu [128.104.255.23]) by mx1.freebsd.org (Postfix) with ESMTP id 9CC1E273A; Fri, 23 May 2014 15:19:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by i3mail.icecube.wisc.edu (Postfix) with ESMTP id 7FC943805E; Fri, 23 May 2014 10:19:36 -0500 (CDT) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from i3mail.icecube.wisc.edu ([127.0.0.1]) by localhost (i3mail.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id r1GOyVppmz2y; Fri, 23 May 2014 10:19:36 -0500 (CDT) Received: from comporellon.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) by i3mail.icecube.wisc.edu (Postfix) with ESMTPSA id ADA883805B; Fri, 23 May 2014 10:19:35 -0500 (CDT) Message-ID: <537F6706.6070509@freebsd.org> Date: Fri, 23 May 2014 08:19:34 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Glen Barber , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r266553 - head/release/scripts References: <201405221922.s4MJM4Y9025265@svn.freebsd.org> In-Reply-To: <201405221922.s4MJM4Y9025265@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: Fri, 23 May 2014 15:19:43 -0000 Is there any chance of finally switching the pkg abi identifiers to just be uname -p? -Nathan On 05/22/14 12:22, Glen Barber wrote: > Author: gjb > Date: Thu May 22 19:22:03 2014 > New Revision: 266553 > URL: http://svnweb.freebsd.org/changeset/base/266553 > > Log: > 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 > > Tested on: stable/9@r265858 with ports-mgmt/pkg-devel > MFC After: 3 days > Sponsored by: The FreeBSD Foundation > > Modified: > head/release/scripts/pkg-stage.sh > > Modified: head/release/scripts/pkg-stage.sh > ============================================================================== > --- head/release/scripts/pkg-stage.sh Thu May 22 18:22:02 2014 (r266552) > +++ head/release/scripts/pkg-stage.sh Thu May 22 19:22:03 2014 (r266553) > @@ -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} >