svn commit: r282665 - projects/release-arm-redux/release/arm

[Glen Barber]

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}"