From owner-svn-src-head@FreeBSD.ORG  Fri Jul 26 14:23:26 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id 40D435AC;
 Fri, 26 Jul 2013 14:23:26 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 150E42DE0;
 Fri, 26 Jul 2013 14:23:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QENPIV057045;
 Fri, 26 Jul 2013 14:23:25 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QENPVj057044;
 Fri, 26 Jul 2013 14:23:25 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201307261423.r6QENPVj057044@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 26 Jul 2013 14:23:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253676 - head/release/sparc64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 14:23:26 -0000

Author: marius
Date: Fri Jul 26 14:23:25 2013
New Revision: 253676
URL: http://svnweb.freebsd.org/changeset/base/253676

Log:
  - Once we have shifted arguments thrice, base-bits-dir is $1 rather than $4.
    Introduce $BASEBITSDIR for clarity and in order to avoid repeating this
    mistake in the future. Fixing this ensures that we pick up the newly built
    boot code and loader native to the target, which is especially relevant
    when cross-building release images.
  - It is pointless to specify an endianess for ISO 9660 images so strip that.
  
  MFC after:	3 days

Modified:
  head/release/sparc64/mkisoimages.sh

Modified: head/release/sparc64/mkisoimages.sh
==============================================================================
--- head/release/sparc64/mkisoimages.sh	Fri Jul 26 14:22:03 2013	(r253675)
+++ head/release/sparc64/mkisoimages.sh	Fri Jul 26 14:23:25 2013	(r253676)
@@ -32,26 +32,28 @@ case $1 in
 esac
 LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
+BASEBITSDIR=$1
 
 # Create an ISO image
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-makefs -t cd9660 -B be -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
-rm $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"
+makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
+rm "${BASEBITSDIR}/etc/fstab"
 
 if [ "x$BOPT" != "x-b" ]; then
 	mv ${NAME}.tmp ${NAME}
 	exit 0
 fi
+
 TMPIMGDIR=`mktemp -d /tmp/bootfs.XXXXXXXX` || exit 1
 BOOTFSDIR="${TMPIMGDIR}/bootfs"
 BOOTFSIMG="${TMPIMGDIR}/bootfs.img"
 
 # Create a boot filesystem
 mkdir -p "${BOOTFSDIR}/boot"
-cp $4/boot/loader "${BOOTFSDIR}/boot"
+cp -p "${BASEBITSDIR}/boot/loader" "${BOOTFSDIR}/boot"
 makefs -t ffs -B be -M 512k "${BOOTFSIMG}" "${BOOTFSDIR}"
-dd if=$4/boot/boot1 of="${BOOTFSIMG}" bs=512 conv=notrunc,sync
+dd if="${BASEBITSDIR}/boot/boot1" of="${BOOTFSIMG}" bs=512 conv=notrunc,sync
 
 # Create a boot ISO image
 : ${CYLSIZE:=640}