mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-06-08 03:40:52 +00:00
u-boot-ti: Do not prepend output files with DEPLOYDIR
We already cd into DEPLOYDIR so this is not needed. This now matches the keystone version below. Also fixes build in some odd situations. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
committed by
Ryan Eatmon
parent
7a0f1d4288
commit
4e9b3f4744
@@ -187,15 +187,15 @@ do_deploy_append () {
|
||||
then
|
||||
cd ${DEPLOYDIR}
|
||||
if [ "x${SPL_UART_BINARY}" != "x" ]; then
|
||||
install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type}
|
||||
rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
|
||||
install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
|
||||
rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
|
||||
ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
|
||||
fi
|
||||
if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
|
||||
install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type}
|
||||
install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
|
||||
rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
|
||||
ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
|
||||
@@ -203,7 +203,7 @@ do_deploy_append () {
|
||||
ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
|
||||
fi
|
||||
if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
|
||||
install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type}
|
||||
install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
|
||||
rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
|
||||
ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
|
||||
@@ -211,7 +211,7 @@ do_deploy_append () {
|
||||
ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
|
||||
fi
|
||||
if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
|
||||
install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type}
|
||||
install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
|
||||
rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
|
||||
ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
|
||||
@@ -219,7 +219,7 @@ do_deploy_append () {
|
||||
ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
|
||||
fi
|
||||
if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
|
||||
install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type}
|
||||
install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
|
||||
rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
|
||||
ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
|
||||
@@ -234,31 +234,31 @@ do_deploy_append () {
|
||||
else
|
||||
cd ${DEPLOYDIR}
|
||||
if [ "x${SPL_UART_BINARY}" != "x" ]; then
|
||||
install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
|
||||
rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
|
||||
ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
|
||||
ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
|
||||
install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
|
||||
rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
|
||||
ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
|
||||
ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
|
||||
fi
|
||||
if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
|
||||
install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
|
||||
install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
|
||||
rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
|
||||
fi
|
||||
if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
|
||||
install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
|
||||
install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
|
||||
rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
|
||||
fi
|
||||
if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
|
||||
install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}
|
||||
install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
|
||||
rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
|
||||
fi
|
||||
if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
|
||||
install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}
|
||||
install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
|
||||
rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
|
||||
ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
|
||||
|
||||
Reference in New Issue
Block a user