bootfiles: Use BOOTFILES_DIR_NAME variable

This variable is set in rpi-base.inc and referenced by other recipes
which need to know the location of the bootfiles. If this is overridden
for any reason we need to ensure that the bootfiles recipe deploys to
the correct path.

Signed-off-by: Paul Barker <pbarker@konsulko.com>
This commit is contained in:
Paul Barker 2020-11-25 15:28:37 +00:00 committed by Andrei Gherzan
parent 8827040d9c
commit b8440b3d26

View File

@ -18,26 +18,26 @@ S = "${RPIFW_S}/boot"
PR = "r3" PR = "r3"
do_deploy() { do_deploy() {
install -d ${DEPLOYDIR}/${PN} install -d ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
for i in ${S}/*.elf ; do for i in ${S}/*.elf ; do
cp $i ${DEPLOYDIR}/${PN} cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
done done
for i in ${S}/*.dat ; do for i in ${S}/*.dat ; do
cp $i ${DEPLOYDIR}/${PN} cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
done done
for i in ${S}/*.bin ; do for i in ${S}/*.bin ; do
cp $i ${DEPLOYDIR}/${PN} cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
done done
# Add stamp in deploy directory # Add stamp in deploy directory
touch ${DEPLOYDIR}/${PN}/${PN}-${PV}.stamp touch ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/${PN}-${PV}.stamp
} }
do_deploy[depends] += "rpi-config:do_deploy rpi-cmdline:do_deploy" do_deploy[depends] += "rpi-config:do_deploy rpi-cmdline:do_deploy"
addtask deploy before do_build after do_install addtask deploy before do_build after do_install
do_deploy[dirs] += "${DEPLOYDIR}/${PN}" do_deploy[dirs] += "${DEPLOYDIR}/${BOOTFILES_DIR_NAME}"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"