diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-05-08 18:45:32 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-05-08 18:45:32 +0000 |
| commit | 4194ca40a5a1a4f3616c144e7b74bd5bd88573db (patch) | |
| tree | 88dbc71d61ef6a2896476d353a22db4467aec8e3 | |
| parent | 0c66fe4daae375aa2f64361f8ca070cf4ed18ad0 (diff) | |
| download | src-4194ca40a5a1a4f3616c144e7b74bd5bd88573db.tar.gz src-4194ca40a5a1a4f3616c144e7b74bd5bd88573db.zip | |
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
Notes
Notes:
svn path=/projects/release-arm-redux/; revision=282654
| -rw-r--r-- | release/arm/BEAGLEBONE.conf | 4 | ||||
| -rw-r--r-- | release/arm/PANDABOARD.conf | 4 | ||||
| -rw-r--r-- | release/arm/RPI-B.conf | 4 | ||||
| -rw-r--r-- | release/arm/RPI2.conf | 4 | ||||
| -rw-r--r-- | release/arm/WANDBOARD-DUAL.conf | 4 | ||||
| -rw-r--r-- | release/arm/WANDBOARD-QUAD.conf | 4 | ||||
| -rw-r--r-- | release/arm/WANDBOARD-SOLO.conf | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index f5d8189c63da..87d2ffe7a6da 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 45b7085a892d..28a46396b4fb 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 5610237ff404..db3c1025fca9 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 7de718835c6d..aadd4582a9c3 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 c20a4a96635f..614a142edd3f 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 d6de53dafab7..a811aaa4ca7d 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 bdc2ef91138a..2878c197c8bf 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}" |