boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts

Since things are no longer installed in $(HOST_DIR)/usr, the callers
should also not refer to it.

This is a mechanical change with
git grep -l 'HOST_DIR}\?/usr/' board | xargs sed -i 's%\(HOST_DIR}\?\)/usr/%\1/%g'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Arnout Vandecappelle 2017-07-05 13:14:26 +02:00 committed by Thomas Petazzoni
parent b2ea6eaf23
commit 31be2ec220
16 changed files with 20 additions and 20 deletions

View File

@ -8,13 +8,13 @@
BOARD_DIR="$(dirname $0)"
# bd u-boot looks for bootscript here
$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript
# u-boot / update script for bd upgradeu command
if [ -e $BINARIES_DIR/u-boot.imx ];
then
install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx
$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n "upgrade script" -d $BOARD_DIR/6x_upgrade.txt $TARGET_DIR/6x_upgrade
fi

View File

@ -14,8 +14,8 @@
# cgpt does not create protective MBR, and the kernel refuses to read
# GPT unless there's some kind of MBR in sector 0. So we need parted
# to write that single sector before doing anything with the GPT.
cgpt=$HOST_DIR/usr/bin/cgpt
parted=$HOST_DIR/usr/sbin/parted
cgpt=$HOST_DIR/bin/cgpt
parted=$HOST_DIR/sbin/parted
kernel=$BINARIES_DIR/uImage.kpart
rootfs=$BINARIES_DIR/rootfs.ext2

View File

@ -5,9 +5,9 @@
# The resulting file is called uImage.kpart.
BOARD_DIR=$(dirname $0)
mkimage=$HOST_DIR/usr/bin/mkimage
futility=$HOST_DIR/usr/bin/futility
devkeys=$HOST_DIR/usr/share/vboot/devkeys
mkimage=$HOST_DIR/bin/mkimage
futility=$HOST_DIR/bin/futility
devkeys=$HOST_DIR/share/vboot/devkeys
run() { echo "$@"; "$@"; }
die() { echo "$@" >&2; exit 1; }

View File

@ -1,6 +1,6 @@
#!/bin/sh
MKIMAGE=$HOST_DIR/usr/bin/mkimage
MKIMAGE=$HOST_DIR/bin/mkimage
BOARD_DIR="$(dirname $0)"
GENIMAGE_CFG="${BOARD_DIR}/sd-image.cfg"

View File

@ -4,7 +4,7 @@
# 2016, "Yann E. MORIN" <yann.morin.1998@free.fr>
BOARD_DIR="$( dirname "${0}" )"
MKIMAGE="${HOST_DIR}/usr/bin/mkimage"
MKIMAGE="${HOST_DIR}/bin/mkimage"
BOOT_CMD="${BOARD_DIR}/boot.cmd"
BOOT_CMD_H="${BINARIES_DIR}/boot.scr"

View File

@ -4,7 +4,7 @@
find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete
BOARD_DIR="$(dirname $0)"
MKIMAGE=$HOST_DIR/usr/bin/mkimage
MKIMAGE=$HOST_DIR/bin/mkimage
BOOT_CMD=$BOARD_DIR/boot.cmd
BOOT_CMD_H=$BINARIES_DIR/boot.scr

View File

@ -3,7 +3,7 @@
# 2013, Carlo Caione <carlo.caione@gmail.com>
BOARD_DIR="$(dirname $0)"
MKIMAGE=$HOST_DIR/usr/bin/mkimage
MKIMAGE=$HOST_DIR/bin/mkimage
BOOT_CMD=$BOARD_DIR/boot.cmd
BOOT_CMD_H=$BINARIES_DIR/boot.scr

View File

@ -1,7 +1,7 @@
#!/bin/sh
BOARD_DIR="$(dirname $0)"
MKIMAGE=$HOST_DIR/usr/bin/mkimage
MKIMAGE=$HOST_DIR/bin/mkimage
$MKIMAGE -C none -A arm64 -T script -d $BOARD_DIR/boot.txt $BINARIES_DIR/boot.scr

View File

@ -1,6 +1,6 @@
#!/bin/sh
MKIMAGE=$HOST_DIR/usr/bin/mkimage
MKIMAGE=$HOST_DIR/bin/mkimage
$MKIMAGE -A arm -O linux -T script -C none \
-d board/olimex/a13_olinuxino/boot.cmd \

View File

@ -3,7 +3,7 @@
# 2013, Carlo Caione <carlo.caione@gmail.com>
BOARD_DIR="$(dirname $0)"
MKIMAGE=$HOST_DIR/usr/bin/mkimage
MKIMAGE=$HOST_DIR/bin/mkimage
BOOT_CMD=$BOARD_DIR/boot.cmd
BOOT_CMD_H=$BINARIES_DIR/boot.scr

View File

@ -16,7 +16,7 @@ __EOF__
else
BOOT_TYPE=bios
# Copy grub 1st stage to binaries, required for genimage
cp -f ${HOST_DIR}/usr/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
cp -f ${HOST_DIR}/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
fi
BOARD_DIR="$(dirname $0)"

View File

@ -2,7 +2,7 @@
BOARD_DIR="$(dirname $0)"
$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \
$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \
-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr

View File

@ -9,7 +9,7 @@ GENIMAGE_TMP=${BUILD_DIR}/.genimage_tmp
rm -rf ${GENIMAGE_TMP}
${HOST_DIR}/usr/bin/genimage \
${HOST_DIR}/bin/genimage \
--config ${GENIMAGE_CFG} \
--rootpath ${TARGET_DIR} \
--tmppath ${GENIMAGE_TMP} \

View File

@ -9,7 +9,7 @@ GENIMAGE_TMP=$BUILD_DIR/.genimage_tmp
rm -rf $GENIMAGE_TMP
${HOST_DIR}/usr/bin/genimage \
${HOST_DIR}/bin/genimage \
--config ${GENIMAGE_CFG} \
--rootpath $TARGET_DIR \
--tmppath $GENIMAGE_TMP \

View File

@ -2,7 +2,7 @@
BOARD_DIR="$(dirname $0)"
$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \
$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \
-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr

View File

@ -2,7 +2,7 @@
BOARD_DIR="$(dirname $0)"
$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \
$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \
-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr