From owner-svn-src-projects@FreeBSD.ORG Thu May 7 18:00:12 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 C9802434; Thu, 7 May 2015 18:00:12 +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 9E77017F7; Thu, 7 May 2015 18:00:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t47I0CJT065897; Thu, 7 May 2015 18:00:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t47I0CI5065896; Thu, 7 May 2015 18:00:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505071800.t47I0CI5065896@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 7 May 2015 18:00:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282592 - 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: Thu, 07 May 2015 18:00:12 -0000 Author: gjb Date: Thu May 7 18:00:12 2015 New Revision: 282592 URL: https://svnweb.freebsd.org/changeset/base/282592 Log: In arm_install_uboot(), mount both FAT and UFS partitions in the empty DESTDIR, and update path names. Copy the ubldr to the FAT partition. [1] Spotted by: andrew [1] Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/arm/BEAGLEBONE.conf Modified: projects/release-arm-redux/release/arm/BEAGLEBONE.conf ============================================================================== --- projects/release-arm-redux/release/arm/BEAGLEBONE.conf Thu May 7 17:50:24 2015 (r282591) +++ projects/release-arm-redux/release/arm/BEAGLEBONE.conf Thu May 7 18:00:12 2015 (r282592) @@ -18,15 +18,25 @@ MD_ARGS="-x 63 -y 255" arm_install_uboot() { UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone" FDT_DIR="${CHROOTDIR}/${WORLDIR}/sys/boot/fdt/dts/arm" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${DESTDIR} - cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${DESTDIR}/MLO - cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${DESTDIR}/u-boot.img - cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dts - cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dtb - cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dts - cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dtb - touch ${CHROOTDIR}/${DESTDIR}/bb-uEnv.txt - umount_loop ${CHROOTDIR}/${DESTDIR} + FATMOUNT="${DESTDIR}/fat" + UFSMOUNT="${DESTDIR}/ufs" + mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO + cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img + cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dts + cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dtb + cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dts + cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dtb + touch ${CHROOTDIR}/${FATMOUNT}/bb-uEnv.txt + cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \ + ${CHROOTDIR}/${FATMOUNT}/ubldr + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + rmdir ${CHROOTDIR}/${FATMOUNT} + rmdir ${CHROOTDIR}/${UFSMOUNT} return 0 }