[meta-rockchip PATCH 0/2] bsp: rkbin: fix build issues around S and WORKDIR

[meta-rockchip PATCH 0/2] bsp: rkbin: fix build issues around S and WORKDIR

[Quentin Schulz]

Since commit 46480a5e6674 ("insane/do_qa_unpack: add checks that ensure
S is set correctly"), three recipes fail to build because they either:

- set S to WORKDIR/git which isn't allowed anymore for git-fetched
  recipes,
- have WORKDIR in S which isn't allowed anymore, UNPACKDIR should be
  used instead,

This fixes the build issues seen on master.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
Quentin Schulz (2):
      bsp: rkbin: fix build since S = "${WORKDIR}/git" is implied by OE-Core
      bsp: rkbin-native: fix build since ${WORKDIR} isn't allowed in S anymore

 recipes-bsp/rkbin/rk3308-rkbin_git.bb          | 2 --
 recipes-bsp/rkbin/rockchip-rkbin-native_git.bb | 2 +-
 recipes-bsp/rkbin/rockchip-rkbin.inc           | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)
---
base-commit: 961768ccd13630a4b98701f5821372a9ede86e85
change-id: 20250625-s-unpackdir-8fee740998d0

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

[meta-rockchip PATCH 1/2] bsp: rkbin: fix build since S = "${WORKDIR}/git" is implied by OE-Core

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

S = "${WORKDIR}/git" is now implied when using the git fetcher and since
commit 46480a5e6674 ("insane/do_qa_unpack: add checks that ensure S is
set correctly") the build fails if it is set to such a value.

Therefore, let's remove the line in rkbin to make the build of those
recipes successful again.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 recipes-bsp/rkbin/rk3308-rkbin_git.bb | 2 --
 recipes-bsp/rkbin/rockchip-rkbin.inc  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/recipes-bsp/rkbin/rk3308-rkbin_git.bb b/recipes-bsp/rkbin/rk3308-rkbin_git.bb
index eaf2ce1f5f0323cc4a6d18bf6c4624f446ccd08c..ab2c70f02f92f7dfbfe19069c3333bebffe8a511 100644
--- a/recipes-bsp/rkbin/rk3308-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rk3308-rkbin_git.bb
@@ -13,8 +13,6 @@ PROVIDES += "optee-os"
 
 inherit bin_package deploy
 
-S = "${WORKDIR}/git"
-
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:rk3308 = "rk3308"
 
diff --git a/recipes-bsp/rkbin/rockchip-rkbin.inc b/recipes-bsp/rkbin/rockchip-rkbin.inc
index 79149c5bebc3c59e337b303f24274ed1925da5ce..25ec58c73e97b3190fd144ca09fca555d25d7f51 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin.inc
+++ b/recipes-bsp/rkbin/rockchip-rkbin.inc
@@ -7,8 +7,6 @@ inherit bin_package deploy
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-S = "${WORKDIR}/git"
-
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:rk3308 = "rk3308"
 COMPATIBLE_MACHINE:rk3566 = "rk3566"

-- 
2.49.0

[meta-rockchip PATCH 2/2] bsp: rkbin-native: fix build since ${WORKDIR} isn't allowed in S anymore

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

Since commit 46480a5e6674 ("insane/do_qa_unpack: add checks that ensure
S is set correctly") it is not allowed to have S refer to WORKDIR
directly and we should instead use UNPACKDIR.

The default path of S is ${UNPACKDIR}/${BP} which is where the git
fetcher will unpack the sources. However, we want to go into the tools/
directory, hence S being ${UNPACKDIR}/${BP}/tools now.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 recipes-bsp/rkbin/rockchip-rkbin-native_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/rkbin/rockchip-rkbin-native_git.bb b/recipes-bsp/rkbin/rockchip-rkbin-native_git.bb
index 2adccdd59bbf454bd5264d503d6d5883b94c472d..71d4246028102563fc2a3c23744eea1411770735 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin-native_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin-native_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=11e3673115959bf596feaaa6ea7ce9a5"
 
 inherit native
 
-S = "${WORKDIR}/git/tools"
+S = "${UNPACKDIR}/${BP}/tools"
 
 # ddrbin_tool.py only uses python and core modules.
 # Yocto depends on a host python anyway so we can simply ignore that dependency

-- 
2.49.0

Re: [yocto-patches] [meta-rockchip PATCH 0/2] bsp: rkbin: fix build issues around S and WORKDIR

[Trevor Woerner]

On Wed 2025-06-25 @ 02:07:12 PM, Quentin Schulz via lists.yoctoproject.org wrote:
> Since commit 46480a5e6674 ("insane/do_qa_unpack: add checks that ensure
> S is set correctly"), three recipes fail to build because they either:
> 
> - set S to WORKDIR/git which isn't allowed anymore for git-fetched
>   recipes,
> - have WORKDIR in S which isn't allowed anymore, UNPACKDIR should be
>   used instead,
> 
> This fixes the build issues seen on master.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
> Quentin Schulz (2):
>       bsp: rkbin: fix build since S = "${WORKDIR}/git" is implied by OE-Core
>       bsp: rkbin-native: fix build since ${WORKDIR} isn't allowed in S anymore
> 
>  recipes-bsp/rkbin/rk3308-rkbin_git.bb          | 2 --
>  recipes-bsp/rkbin/rockchip-rkbin-native_git.bb | 2 +-
>  recipes-bsp/rkbin/rockchip-rkbin.inc           | 2 --
>  3 files changed, 1 insertion(+), 5 deletions(-)
> ---
> base-commit: 961768ccd13630a4b98701f5821372a9ede86e85
> change-id: 20250625-s-unpackdir-8fee740998d0

Applied to meta-rockchip, master branch. Thanks!