[master/scarthgap] meta-ide-support: Mark recipe as MACHINE-specific

meta-ide-support:do_write_test_data dumps the bitbake data dictionary to
a file using export2json(). As this obviously includes the value of
MACHINE, and other MACHINE-specific variables, the recipe needs to be
marked as MACHINE-specific.

Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
 meta/recipes-core/meta/meta-ide-support.bb | 1 +
 1 file changed, 1 insertion(+)

On Thu, 2024-09-05 at 21:21 +0100, Paul Barker via lists.openembedded.org wrote:
> meta-ide-support:do_write_test_data dumps the bitbake data dictionary to
> a file using export2json(). As this obviously includes the value of
> MACHINE, and other MACHINE-specific variables, the recipe needs to be
> marked as MACHINE-specific.
> 
> Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> ---
>  meta/recipes-core/meta/meta-ide-support.bb | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb
> index d85aa120c08b..7ed422ce4ddb 100644
> --- a/meta/recipes-core/meta/meta-ide-support.bb
> +++ b/meta/recipes-core/meta/meta-ide-support.bb
> @@ -1,6 +1,7 @@
>  SUMMARY = "Integrated Development Environment support"
>  DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE"
>  LICENSE = "MIT"
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
>  DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native"
>  RM_WORK_EXCLUDE += "${PN}"

Something about this is making our toolchain tests unhappy, e.g.:

https://valkyrie.yoctoproject.org/#/builders/42/builds/86/steps/12/logs/stdio

I've not looked into it at all, just reporting what we've need to fix
in order to be able to consider merging this.

Cheers,

Richard

On Thu, 2024-09-05 at 23:40 +0100, Richard Purdie via lists.openembedded.org wrote:
> On Thu, 2024-09-05 at 21:21 +0100, Paul Barker via lists.openembedded.org wrote:
> > meta-ide-support:do_write_test_data dumps the bitbake data dictionary to
> > a file using export2json(). As this obviously includes the value of
> > MACHINE, and other MACHINE-specific variables, the recipe needs to be
> > marked as MACHINE-specific.
> > 
> > Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> > ---
> >  meta/recipes-core/meta/meta-ide-support.bb | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb
> > index d85aa120c08b..7ed422ce4ddb 100644
> > --- a/meta/recipes-core/meta/meta-ide-support.bb
> > +++ b/meta/recipes-core/meta/meta-ide-support.bb
> > @@ -1,6 +1,7 @@
> >  SUMMARY = "Integrated Development Environment support"
> >  DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE"
> >  LICENSE = "MIT"
> > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> >  
> >  DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native"
> >  RM_WORK_EXCLUDE += "${PN}"
> 
> Something about this is making our toolchain tests unhappy, e.g.:
> 
> https://valkyrie.yoctoproject.org/#/builders/42/builds/86/steps/12/logs/stdio
> 
> I've not looked into it at all, just reporting what we've need to fix
> in order to be able to consider merging this.

It can be fixed with:

diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py
index ffe0d2604d1..5a17ca52ea1 100644
--- a/meta/lib/oeqa/selftest/cases/meta_ide.py
+++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
@@ -20,8 +20,8 @@ class MetaIDE(OESelftestTestCase):
         bitbake('meta-ide-support')
         bitbake('build-sysroots -c build_native_sysroot')
         bitbake('build-sysroots -c build_target_sysroot')
-        bb_vars = get_bb_vars(['MULTIMACH_TARGET_SYS', 'DEPLOY_DIR_IMAGE', 'COREBASE'])
-        cls.environment_script = 'environment-setup-%s' % bb_vars['MULTIMACH_TARGET_SYS']
+        bb_vars = get_bb_vars(['MACHINE_ARCH', 'TARGET_VENDOR', 'TARGET_OS', 'DEPLOY_DIR_IMAGE', 'COREBASE'])
+        cls.environment_script = 'environment-setup-%s%s-%s' % (bb_vars['MACHINE_ARCH'], bb_vars['TARGET_VENDOR'], bb_vars['TARGET_OS'])
         cls.deploydir = bb_vars['DEPLOY_DIR_IMAGE']
         cls.environment_script_path = '%s/%s' % (cls.deploydir, cls.environment_script)
         cls.corebasedir = bb_vars['COREBASE']

Whether that is a good/right fix, I'm not sure...

Cheers,

Richard