diff mbox series

[meta-rockchip] rkbin:rk3308: pre-cleanup

Message ID 20231103152130.9912-1-twoerner@gmail.com
State New
Headers show
Series [meta-rockchip] rkbin:rk3308: pre-cleanup | expand

Commit Message

Trevor Woerner Nov. 3, 2023, 3:21 p.m. UTC 
Since 2 recipes can provide the same rk3308-specific blobs, switching
between them can potentially cause: "... is trying to install files into a
shared area when those files already exist" errors. Perform a pre-cleanup
in both recipes so they don't step on each others' toes.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-bsp/rkbin/rk3308-rkbin_git.bb   | 5 +++++
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 5 +++++
 2 files changed, 10 insertions(+)
diff mbox series

Patch

diff --git a/recipes-bsp/rkbin/rk3308-rkbin_git.bb b/recipes-bsp/rkbin/rk3308-rkbin_git.bb
index c6b05b242738..65ee136eff7c 100644
--- a/recipes-bsp/rkbin/rk3308-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rk3308-rkbin_git.bb
@@ -26,6 +26,11 @@  PACKAGES = "${PN}"
 ALLOW_EMPTY:${PN} = "1"
 
 do_deploy:rk3308() {
+	# cleanup first
+	rm -f ${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf
+	rm -f ${DEPLOY_DIR_IMAGE}/tee-rk3308.bin
+	rm -f ${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin
+
 	# Prebuilt TF-A
 	install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf
 	# Prebuilt OPTEE-OS
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index f1609c7a4957..3f842d669c76 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -27,6 +27,11 @@  PACKAGES = "${PN}"
 ALLOW_EMPTY:${PN} = "1"
 
 do_deploy:rk3308() {
+	# cleanup first
+	rm -f ${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf
+	rm -f ${DEPLOY_DIR_IMAGE}/tee-rk3308.bin
+	rm -f ${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin
+
 	# Prebuilt TF-A
 	install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf
 	# Prebuilt OPTEE-OS