From owner-svn-src-user@freebsd.org  Fri Feb  5 18:13:56 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA471A9D488
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 18:13:56 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A1119FDB;
 Fri,  5 Feb 2016 18:13:56 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15IDtfh007707;
 Fri, 5 Feb 2016 18:13:55 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15IDth7007706;
 Fri, 5 Feb 2016 18:13:55 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602051813.u15IDth7007706@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 18:13:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295328 - user/cperciva/freebsd-update-build/scripts
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 18:13:57 -0000

Author: glebius
Date: Fri Feb  5 18:13:55 2016
New Revision: 295328
URL: https://svnweb.freebsd.org/changeset/base/295328

Log:
  More merges from custom build.subr.

Modified:
  user/cperciva/freebsd-update-build/scripts/build.subr

Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr	Fri Feb  5 18:10:16 2016	(r295327)
+++ user/cperciva/freebsd-update-build/scripts/build.subr	Fri Feb  5 18:13:55 2016	(r295328)
@@ -335,23 +335,23 @@ extractiso () {
 	log "Extracting components"
 	for C in ${WORLDPARTS}; do
 		mkdir -p ${WORKDIR}/release/R/trees/world/${C}
-		cat ${WORKDIR}/iso/${REL}/${C}/${C}.?? |
+		cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
 		    tar -xpzf - -C ${WORKDIR}/release/R/trees/world/${C}
 	done
 	for C in ${KERNELPARTS}; do
 		mkdir -p ${WORKDIR}/release/R/trees/kernel/${C}
-		cat ${WORKDIR}/iso/${REL}/kernels/${C}.?? |
+		cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
 		    tar -xpzf - -C ${WORKDIR}/release/R/trees/kernel/${C}
 	done
 	for C in ${SOURCEPARTS}; do
 		mkdir -p ${WORKDIR}/release/R/trees/src/${C}
-		cat ${WORKDIR}/iso/${REL}/src/s${C}.?? |
+		cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
 		    tar -xpzf - -C ${WORKDIR}/release/R/trees/src/${C}
 	done
 
 	# If the release ISO we're handling belongs to the platform
 	# we're running right now, create a world image for future use.
-	if [ ${TARGET} = ${HOSTPLATFORM} ] || [ "${HOSTPLATFORM}" = "amd64" -a "${TARGET}" = "i386" ]; then
+	if [ ${TARGET} = ${HOSTPLATFORM} ]; then
 		log "Constructing world+src image"
 
 		# Create directory for world
@@ -359,12 +359,12 @@ extractiso () {
 
 		# Extract world and source distributions
 		for C in ${WORLDPARTS}; do
-			cat ${WORKDIR}/iso/${REL}/${C}/${C}.?? |
+			cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
 			    tar -xpzf - -C ${WORKDIR}/world/
 		done
 		for C in ${SOURCEPARTS}; do
-			cat ${WORKDIR}/iso/${REL}/src/s${C}.?? |
-			    tar -xpzf - -C ${WORKDIR}/world/usr/src/
+			cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
+			    tar -xpzf - -C ${WORKDIR}/world/
 		done
 
 		# build a single tarball of them.