From 98b2e7585159407e34f8cce2238a46facea9a7be Mon Sep 17 00:00:00 2001
From: Natalia Kovalenko <waykovalenko@gmail.com>
Date: Mon, 6 Jun 2022 00:12:22 +0200
Subject: [PATCH] u-boot-seco: Replace ${DEPLOY_DIR_IMAGE} with ${DEPLOYDIR} in
do_deploy task
Yocto ref. manual caution: Do not write the output directly to ${DEPLOY_DIR_IMAGE},
as this causes the sstate mechanism to malfunction.
Remove do_deploy task from rk-binary-native, as we do not use those binaries
---
recipes-bsp/rk-binary/rk-binary-native.bb | 27 -----------------------
recipes-bsp/u-boot/u-boot-seco_2017.09.bb | 10 ++++-----
2 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/recipes-bsp/rk-binary/rk-binary-native.bb b/recipes-bsp/rk-binary/rk-binary-native.bb
index 551a72d..9805494 100644
--- a/recipes-bsp/rk-binary/rk-binary-native.bb
+++ b/recipes-bsp/rk-binary/rk-binary-native.bb
@@ -48,30 +48,3 @@ do_install () {
install -m 0755 afptool ${D}/${bindir}
install -m 0755 rkImageMaker ${D}/${bindir}
}
-
-
-NATIVE_TOOLS = "boot_merger trust_merger firmwareMerger loaderimage mkkrnlimg resource_tool upgrade_tool"
-NATIVE_EXTRA_TOOLS = "afptool rkImageMaker"
-
-addtask deploy before do_build after do_compile
-do_deploy () {
- cd ${S}/tools
-
- if [ ! -e ${DEPLOY_DIR_IMAGE}/rk_tools ]; then
- install -d ${DEPLOY_DIR_IMAGE}/rk_tools
- fi
-
- for binary in "${NATIVE_TOOLS}"; do
- if [[ ! -e ${DEPLOY_DIR_IMAGE}/rk_tools/${binary} ]]; then
- install -m 0755 ${binary} ${DEPLOY_DIR_IMAGE}/rk_tools
- fi
- done
-
- cd ${S}/extra/linux/Linux_Pack_Firmware/rockdev
-
- for binary in "${NATIVE_EXTRA_TOOLS}"; do
- if [[ ! -e ${DEPLOY_DIR_IMAGE}/rk_tools/${binary} ]]; then
- install -m 0755 ${binary} ${DEPLOY_DIR_IMAGE}/rk_tools
- fi
- done
-}
diff --git a/recipes-bsp/u-boot/u-boot-seco_2017.09.bb b/recipes-bsp/u-boot/u-boot-seco_2017.09.bb
index e948561..a6b7be0 100644
--- a/recipes-bsp/u-boot/u-boot-seco_2017.09.bb
+++ b/recipes-bsp/u-boot/u-boot-seco_2017.09.bb
@@ -108,10 +108,8 @@ do_deploy:append() {
ln -sf "${binary}-${PV}" "${DEPLOYDIR}/${binary}"
done
- install -m 0755 *_loader*.bin ${DEPLOY_DIR_IMAGE}
-
- install -m 0755 ${WORKDIR}/rkbin/tools/upgrade_tool ${DEPLOY_DIR_IMAGE}
-
- install -m 0755 ${WORKDIR}/flash_d23.sh ${DEPLOY_DIR_IMAGE}
- install -m 0755 ${WORKDIR}/uEnvD23.txt ${DEPLOY_DIR_IMAGE}
+ install -m 0755 *_loader*.bin ${DEPLOYDIR}
+ install -m 0755 ${WORKDIR}/rkbin/tools/upgrade_tool ${DEPLOYDIR}
+ install -m 0755 ${WORKDIR}/flash_d23.sh ${DEPLOYDIR}
+ install -m 0755 ${WORKDIR}/uEnvD23.txt ${DEPLOYDIR}
}
--
GitLab