Date: Fri, 8 May 2015 18:45:33 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282654 - projects/release-arm-redux/release/arm Message-ID: <201505081845.t48IjXqG033587@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri May 8 18:45:32 2015 New Revision: 282654 URL: https://svnweb.freebsd.org/changeset/base/282654 Log: 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 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-DUAL.conf projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf Modified: projects/release-arm-redux/release/arm/BEAGLEBONE.conf ============================================================================== --- projects/release-arm-redux/release/arm/BEAGLEBONE.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/BEAGLEBONE.conf Fri May 8 18:45:32 2015 (r282654) @@ -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} Modified: projects/release-arm-redux/release/arm/PANDABOARD.conf ============================================================================== --- projects/release-arm-redux/release/arm/PANDABOARD.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/PANDABOARD.conf Fri May 8 18:45:32 2015 (r282654) @@ -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} Modified: projects/release-arm-redux/release/arm/RPI-B.conf ============================================================================== --- projects/release-arm-redux/release/arm/RPI-B.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/RPI-B.conf Fri May 8 18:45:32 2015 (r282654) @@ -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} Modified: projects/release-arm-redux/release/arm/RPI2.conf ============================================================================== --- projects/release-arm-redux/release/arm/RPI2.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/RPI2.conf Fri May 8 18:45:32 2015 (r282654) @@ -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} Modified: projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf ============================================================================== --- projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/WANDBOARD-DUAL.conf Fri May 8 18:45:32 2015 (r282654) @@ -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}" Modified: projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf ============================================================================== --- projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/WANDBOARD-QUAD.conf Fri May 8 18:45:32 2015 (r282654) @@ -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}" Modified: projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf ============================================================================== --- projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf Fri May 8 17:53:44 2015 (r282653) +++ projects/release-arm-redux/release/arm/WANDBOARD-SOLO.conf Fri May 8 18:45:32 2015 (r282654) @@ -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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505081845.t48IjXqG033587>