diff mbox series

[1/2] populate_sdk_base.bbclass: PATH to nativesdk-intercept chown/chgrp

Message ID 7d08e28bb59c6734f3e018722411205630886419.1694086051.git.pidge@baylibre.com
State New
Headers show
Series Fix nativesdk-intercepts for chown/chgrp | expand

Commit Message

Eilís 'pidge' Ní Fhlannagáin Sept. 7, 2023, 11:38 a.m. UTC
[YOCTO #15023]

This patch fixes building the sdk with api-documentation enabled by
appending PATH with the nativesdk-intercept directory which contains a
special version of chown and chgrp.

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
---
 meta/classes-recipe/populate_sdk_base.bbclass | 1 +
 1 file changed, 1 insertion(+)

Comments

Richard Purdie Sept. 7, 2023, 1:49 p.m. UTC | #1
On Thu, 2023-09-07 at 11:38 +0000, Eilís 'pidge' Ní Fhlannagáin wrote:
> [YOCTO #15023]
> 
> This patch fixes building the sdk with api-documentation enabled by
> appending PATH with the nativesdk-intercept directory which contains a
> special version of chown and chgrp.
> 
> Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
> ---
>  meta/classes-recipe/populate_sdk_base.bbclass | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
> index b23ea26d409..632266cc162 100644
> --- a/meta/classes-recipe/populate_sdk_base.bbclass
> +++ b/meta/classes-recipe/populate_sdk_base.bbclass
> @@ -17,6 +17,7 @@ COMPLEMENTARY_GLOB[dbg-pkgs] = '*-dbg'
>  COMPLEMENTARY_GLOB[src-pkgs] = '*-src'
>  COMPLEMENTARY_GLOB[ptest-pkgs] = '*-ptest ${MLPREFIX}ptest-runner'
>  COMPLEMENTARY_GLOB[bash-completion-pkgs] = '*-bash-completion'
> +PATH:prepend = "${COREBASE}/scripts/nativesdk-intercept:"
>  
>  def complementary_globs(featurevar, d):
>      all_globs = d.getVarFlags('COMPLEMENTARY_GLOB')

Sorry to be the bearer of bad news but that won't work. The class is
included for normal rootfs generation as well as sdk generation and so
it would add the intercepts for normal rootfs too :(

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
index b23ea26d409..632266cc162 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -17,6 +17,7 @@  COMPLEMENTARY_GLOB[dbg-pkgs] = '*-dbg'
 COMPLEMENTARY_GLOB[src-pkgs] = '*-src'
 COMPLEMENTARY_GLOB[ptest-pkgs] = '*-ptest ${MLPREFIX}ptest-runner'
 COMPLEMENTARY_GLOB[bash-completion-pkgs] = '*-bash-completion'
+PATH:prepend = "${COREBASE}/scripts/nativesdk-intercept:"
 
 def complementary_globs(featurevar, d):
     all_globs = d.getVarFlags('COMPLEMENTARY_GLOB')