Date: Fri, 26 Jul 2013 14:23:25 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253676 - head/release/sparc64 Message-ID: <201307261423.r6QENPVj057044@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307261423.r6QENPVj057044>