summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2015-05-08 17:53:44 +0000
committergjb <gjb@FreeBSD.org>2015-05-08 17:53:44 +0000
commiteff85709da377431239a785b14d3fef1ffcb6494 (patch)
tree3aababbf7724d827df057faffbd3fdd505be4bb6
parent53b50c1a769415fa150957dce8b6a53d5bee3ea5 (diff)
downloadFreeBSD-src-eff85709da377431239a785b14d3fef1ffcb6494.zip
FreeBSD-src-eff85709da377431239a785b14d3fef1ffcb6494.tar.gz
Fix path to the u-boot.imx file, which is relative to the root of
the chroot environment. Sponsored by: The FreeBSD Foundation
-rw-r--r--release/arm/WANDBOARD-DUAL.conf2
-rw-r--r--release/arm/WANDBOARD-QUAD.conf2
-rw-r--r--release/arm/WANDBOARD-SOLO.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
index e69dec3..c20a4a9 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -21,7 +21,7 @@ arm_install_uboot() {
UBOOT_FILES="u-boot.imx"
FATMOUNT="${DESTDIR}/fat"
UFSMOUNT="${DESTDIR}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
of=/dev/${mddev} bs=512 seek=2
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 0ddf3d3..d6de53d 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -21,7 +21,7 @@ arm_install_uboot() {
UBOOT_FILES="u-boot.imx"
FATMOUNT="${DESTDIR}/fat"
UFSMOUNT="${DESTDIR}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
of=/dev/${mddev} bs=512 seek=2
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
index b7b035e..bdc2ef9 100644
--- a/release/arm/WANDBOARD-SOLO.conf
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -21,7 +21,7 @@ arm_install_uboot() {
UBOOT_FILES="u-boot.imx"
FATMOUNT="${DESTDIR}/fat"
UFSMOUNT="${DESTDIR}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
of=/dev/${mddev} bs=512 seek=2
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
OpenPOWER on IntegriCloud