From owner-svn-src-projects@FreeBSD.ORG Fri May 8 17:53:45 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9889A09; Fri, 8 May 2015 17:53:45 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADDA21B1C; Fri, 8 May 2015 17:53:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t48HrjBi007062; Fri, 8 May 2015 17:53:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t48Hrjem007059; Fri, 8 May 2015 17:53:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505081753.t48Hrjem007059@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 8 May 2015 17:53:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282653 - projects/release-arm-redux/release/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2015 17:53:45 -0000 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}