From 5d073c61c8404610b24767a96481d3bf15b819da Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sat, 10 Aug 2019 09:53:59 +0800 Subject: u-boot-distro-boot: some clean up - Inherit nopackages since it does not generate any non-empty packages. - Drop do_compile, we can run mkimage directly in do_deploy task. - Drop 'S = "${WORKDIR}"', we do not have to explicitly set it, the default S would be good enough. - Do not install DEPLOYDIR, that is not necessary, it's already done in deploy.bbclass. - Do not set noexec flag to do_install, do_populate_sysroot, they are basically empty tasks, making do_populate_sysroot noexec also will cause QA warning when u-boot-distro-boot is set to DEPENDS in other recipes. Signed-off-by: Ming Liu --- recipes-bsp/u-boot/u-boot-distro-boot.bb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-distro-boot.bb b/recipes-bsp/u-boot/u-boot-distro-boot.bb index 474ec66..f7a5ae9 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot.bb +++ b/recipes-bsp/u-boot/u-boot-distro-boot.bb @@ -12,24 +12,16 @@ SRC_URI = " \ KERNEL_BOOTCMD ??= "bootz" KERNEL_BOOTCMD_aarch64 ?= "booti" -S = "${WORKDIR}" +inherit deploy nopackages -inherit deploy - -do_compile() { +do_deploy() { sed -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \ "${WORKDIR}/boot.cmd.in" > boot.cmd - mkimage -T script -C none -n "Distro boot script" -d "${WORKDIR}/boot.cmd" boot.scr -} + mkimage -T script -C none -n "Distro boot script" -d boot.cmd boot.scr -do_deploy() { - install -d ${DEPLOYDIR} install -m 0644 boot.scr ${DEPLOYDIR} } addtask deploy after do_install before do_build -do_install[noexec] = "1" -do_populate_sysroot[noexec] = "1" - PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3