Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 May 2015 17:53:44 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r282653 - projects/release-arm-redux/release/arm
Message-ID:  <201505081753.t48Hrjem007059@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Fri May  8 17:53:44 2015
New Revision: 282653
URL: https://svnweb.freebsd.org/changeset/base/282653

Log:
  Fix path to the u-boot.imx file, which is relative to the root of
  the chroot environment.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf
  projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf
  projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf

Modified: projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf
==============================================================================
--- projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf	Fri May  8 17:48:48 2015	(r282652)
+++ projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf	Fri May  8 17:53:44 2015	(r282653)
@@ -21,7 +21,7 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf
==============================================================================
--- projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf	Fri May  8 17:48:48 2015	(r282652)
+++ projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf	Fri May  8 17:53:44 2015	(r282653)
@@ -21,7 +21,7 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}

Modified: projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf
==============================================================================
--- projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf	Fri May  8 17:48:48 2015	(r282652)
+++ projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf	Fri May  8 17:53:44 2015	(r282653)
@@ -21,7 +21,7 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505081753.t48Hrjem007059>