From 83dbcdd67987795b0a43699b57a432b8e580b6a1 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 18:45:32 +0000
Subject: Strip the KERNEL from the mount paths, working around the following
 error:

 root@releng2:/ # mount_msdosfs /dev/md5s1 /usr/obj/usr/src/release/WANDBOARD-QUAD/fat
 mount_msdosfs: /dev/md5s1: File name too long

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf     | 4 ++--
 release/arm/PANDABOARD.conf     | 4 ++--
 release/arm/RPI-B.conf          | 4 ++--
 release/arm/RPI2.conf           | 4 ++--
 release/arm/WANDBOARD-DUAL.conf | 4 ++--
 release/arm/WANDBOARD-QUAD.conf | 4 ++--
 release/arm/WANDBOARD-SOLO.conf | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index f5d8189..87d2ffe 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -18,8 +18,8 @@ NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/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}
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 45b7085..28a4639 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -18,8 +18,8 @@ MD_ARGS="-x 63 -y 255"
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-pandaboard"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/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}
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 5610237..db3c102 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -20,8 +20,8 @@ arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/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}/fat"
-	UFSMOUNT="${DESTDIR}/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}
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 7de7188..aadd458 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -20,8 +20,8 @@ arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/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}/fat"
-	UFSMOUNT="${DESTDIR}/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}
diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
index c20a4a9..614a142 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -19,8 +19,8 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index d6de53d..a811aaa 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -19,8 +19,8 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
index bdc2ef9..2878c19 100644
--- a/release/arm/WANDBOARD-SOLO.conf
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -19,8 +19,8 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-- 
cgit v1.1