From owner-svn-src-projects@FreeBSD.ORG Fri May 8 20:45:40 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB61F787; Fri, 8 May 2015 20:45:40 +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 CAB0D1EEC; Fri, 8 May 2015 20:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t48Kje5B094978; Fri, 8 May 2015 20:45:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t48Kjdxq094973; Fri, 8 May 2015 20:45:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505082045.t48Kjdxq094973@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 20:45:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282665 - 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 20:45:41 -0000 Author: gjb Date: Fri May 8 20:45:38 2015 New Revision: 282665 URL: https://svnweb.freebsd.org/changeset/base/282665 Log: Really fix the 'fat/' and 'ufs/' directory names. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/arm/BEAGLEBONE.conf projects/release-arm-redux/release/arm/PANDABOARD.conf projects/release-arm-redux/release/arm/RPI-B.conf projects/release-arm-redux/release/arm/RPI2.conf projects/release-arm-redux/release/arm/WANDBOARD.conf Modified: projects/release-arm-redux/release/arm/BEAGLEBONE.conf ============================================================================== --- projects/release-arm-redux/release/arm/BEAGLEBONE.conf Fri May 8 20:09:26 2015 (r282664) +++ projects/release-arm-redux/release/arm/BEAGLEBONE.conf Fri May 8 20:45:38 2015 (r282665) @@ -18,8 +18,8 @@ NODOC=1 arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone" - FATMOUNT="${DESTDIR##${KERNEL}}/fat" - UFSMOUNT="${DESTDIR##${KERNEL}}/ufs" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} Modified: projects/release-arm-redux/release/arm/PANDABOARD.conf ============================================================================== --- projects/release-arm-redux/release/arm/PANDABOARD.conf Fri May 8 20:09:26 2015 (r282664) +++ projects/release-arm-redux/release/arm/PANDABOARD.conf Fri May 8 20:45:38 2015 (r282665) @@ -18,8 +18,8 @@ MD_ARGS="-x 63 -y 255" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard" - FATMOUNT="${DESTDIR##${KERNEL}}/fat" - UFSMOUNT="${DESTDIR##${KERNEL}}/ufs" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} Modified: projects/release-arm-redux/release/arm/RPI-B.conf ============================================================================== --- projects/release-arm-redux/release/arm/RPI-B.conf Fri May 8 20:09:26 2015 (r282664) +++ projects/release-arm-redux/release/arm/RPI-B.conf Fri May 8 20:45:38 2015 (r282665) @@ -20,8 +20,8 @@ arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi" UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ start.elf start_cd.elf u-boot.img" - FATMOUNT="${DESTDIR##${KERNEL}}/fat" - UFSMOUNT="${DESTDIR##${KERNEL}}/ufs" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} Modified: projects/release-arm-redux/release/arm/RPI2.conf ============================================================================== --- projects/release-arm-redux/release/arm/RPI2.conf Fri May 8 20:09:26 2015 (r282664) +++ projects/release-arm-redux/release/arm/RPI2.conf Fri May 8 20:45:38 2015 (r282665) @@ -20,8 +20,8 @@ arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2" UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin" - FATMOUNT="${DESTDIR##${KERNEL}}/fat" - UFSMOUNT="${DESTDIR##${KERNEL}}/ufs" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} Modified: projects/release-arm-redux/release/arm/WANDBOARD.conf ============================================================================== --- projects/release-arm-redux/release/arm/WANDBOARD.conf Fri May 8 20:09:26 2015 (r282664) +++ projects/release-arm-redux/release/arm/WANDBOARD.conf Fri May 8 20:45:38 2015 (r282665) @@ -19,8 +19,8 @@ NODOC=1 arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard" UBOOT_FILES="u-boot.imx" - FATMOUNT="${DESTDIR##${KERNEL}}/fat" - UFSMOUNT="${DESTDIR##${KERNEL}}/ufs" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ of=/dev/${mddev} bs=512 seek=2 chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"