u-boot: fix name of deployed artifacts

And also reduce the number of created artifacts and simplify do_deploy.
The rm commands are not required. bitbake is smart enough to remove the
old deployed artifacts of a recipe.

BugzID: 74357

Signed-off-by: Patrick Zysset <patrick.zysset@netmodule.com>
This commit is contained in:
Alexandre Bard 2021-08-19 13:14:30 +02:00 committed by Patrick Zysset
parent 7cdc60e983
commit 4d68c84dfc
2 changed files with 9 additions and 14 deletions

View File

@ -14,12 +14,9 @@ PV = "v2017.11+git${SRCPV}"
UBOOT_SUFFIX = "kwb"
UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
do_deploy_append() {
rm -f ${DEPLOYDIR}/${PN}-spl.bin
rm -f ${DEPLOYDIR}/${PN}.bin
rm -f ${DEPLOYDIR}/${PN}-spl.kwb
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
cp ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
do_deploy() {
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-u-boot-${MACHINE}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/u-boot-${MACHINE}.xmodem.bin
cp ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/u-boot-${MACHINE}.${UBOOT_SUFFIX}
}

View File

@ -10,11 +10,9 @@ PV = "v2016.05+git${SRCPV}"
SPL_BINARY = "MLO"
UBOOT_SUFFIX = "img"
do_deploy_append() {
rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
do_deploy() {
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-u-boot-${MACHINE}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/u-boot-${MACHINE}.xmodem.bin
cp ${S}/MLO ${DEPLOYDIR}/spl-u-boot-${MACHINE}.${UBOOT_SUFFIX}
cp ${S}/u-boot.img ${DEPLOYDIR}/u-boot-${MACHINE}.${UBOOT_SUFFIX}
}