u-boot-script-toradex: Rework to use boot.scr-${MACHINE}

Rework recipe changing do_mkimage task, adding a do_install task and
changing do_deploy to output boot.scr file using machine name appended.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
This commit is contained in:
Fabio Berton 2020-03-30 16:04:49 -03:00 committed by Otavio Salvador
parent faa3c12c34
commit 79d845df0d
7 changed files with 25 additions and 10 deletions

View File

@ -32,7 +32,7 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
IMAGE_FSTYPES += "tar.xz"
# wic support
IMAGE_BOOT_FILES_append = " boot.scr"
IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
WKS_FILE_DEPENDS_append = " u-boot-script-toradex"
WKS_FILE = "sdimage-bootpart.wks"

View File

@ -31,7 +31,7 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
IMAGE_FSTYPES += "tar.xz"
# wic support
IMAGE_BOOT_FILES_append = " boot.scr"
IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
WKS_FILE_DEPENDS_append = " u-boot-script-toradex"
WKS_FILE = "sdimage-bootpart.wks"

View File

@ -26,7 +26,7 @@ UBOOT_MACHINE ?= "colibri-imx6ull_defconfig"
IMAGE_FSTYPES += "tar.xz"
# wic support
IMAGE_BOOT_FILES_append = " boot.scr"
IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
WKS_FILE_DEPENDS_append = " u-boot-script-toradex"
WKS_FILE = "sdimage-bootpart.wks"

View File

@ -21,7 +21,7 @@ PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
UBOOT_MACHINE ?= "colibri_imx7_emmc_defconfig"
IMAGE_FSTYPES += "tar.xz"
IMAGE_BOOT_FILES_append = " boot.scr"
WKS_FILE_DEPENDS_append = " u-boot-script-toradex"
IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"

View File

@ -30,7 +30,7 @@ UBOOT_MACHINE ?= "colibri_imx7_defconfig"
IMAGE_FSTYPES += "tar.xz"
# wic support
IMAGE_BOOT_FILES_append = " boot.scr"
IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
WKS_FILE_DEPENDS_append = " u-boot-script-toradex"
WKS_FILE = "sdimage-bootpart.wks"

View File

@ -33,7 +33,7 @@ UBOOT_MACHINE ?= "colibri_vf_defconfig"
IMAGE_FSTYPES += "tar.xz ubifs"
# wic support
IMAGE_BOOT_FILES_append = " boot.scr"
IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
WKS_FILE_DEPENDS_append = " u-boot-script-toradex"
WKS_FILE = "sdimage-bootpart.wks"

View File

@ -14,11 +14,26 @@ KERNEL_BOOTCMD_aarch64 ?= "booti"
inherit deploy nopackages
do_deploy() {
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_mkimage() {
sed -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
"${WORKDIR}/boot.cmd.in" > boot.cmd
mkimage -T script -C none -n "Distro boot script" -d boot.cmd boot.scr
install -m 0644 boot.scr ${DEPLOYDIR}
"${WORKDIR}/boot.cmd.in" > ${B}/boot.cmd
mkimage -T script -C none -n "Distro boot script" -d ${B}/boot.cmd ${B}/boot.scr
}
addtask mkimage after do_compile before do_install
do_install() {
install -Dm 0644 ${B}/boot.scr ${D}/boot.scr
}
do_deploy() {
install -Dm 0644 ${D}/boot.scr ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
cd ${DEPLOYDIR}
rm -f boot.scr-${MACHINE}
ln -sf boot.scr-${MACHINE}-${PV}-${PR} boot.scr-${MACHINE}
}
addtask deploy after do_install before do_build