[PATCH 1/3] native: Clear TUNE_FEATURES/ABIEXTENSION

[PATCH 1/3] native: Clear TUNE_FEATURES/ABIEXTENSION

[Richard Purdie]

Some recipes reference these. Rather than continually trying to chase down the references
and taskhash issues, clear the variables for an easier life and simpler code. These
wouldn't convey anything useful in a native build.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/native.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index fc7422c5d7a..5a273cdebba 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -23,6 +23,8 @@ TARGET_CFLAGS = "${BUILD_CFLAGS}"
 TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}"
 TARGET_LDFLAGS = "${BUILD_LDFLAGS}"
 TARGET_FPU = ""
+TUNE_FEATURES = ""
+ABIEXTENSION = ""
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_OS = "${BUILD_OS}"
-- 
2.34.1

[PATCH 2/3] oeqa/sdk: Add basic rust cargo test

[Richard Purdie]

From: Otavio Salvador <otavio@ossystems.com.br>

Add a QA test to the SDK to test that a basic cargo build works.

[RP: Tweaked to work for multilibs and updated to match toolchain changes]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oeqa/sdk/cases/rust.py               | 33 +++++++++++++++++++
 meta/lib/oeqa/sdk/files/rust/hello/Cargo.toml |  6 ++++
 .../lib/oeqa/sdk/files/rust/hello/src/main.rs |  3 ++
 3 files changed, 42 insertions(+)
 create mode 100644 meta/lib/oeqa/sdk/cases/rust.py
 create mode 100644 meta/lib/oeqa/sdk/files/rust/hello/Cargo.toml
 create mode 100644 meta/lib/oeqa/sdk/files/rust/hello/src/main.rs

diff --git a/meta/lib/oeqa/sdk/cases/rust.py b/meta/lib/oeqa/sdk/cases/rust.py
new file mode 100644
index 00000000000..c122b64d0c5
--- /dev/null
+++ b/meta/lib/oeqa/sdk/cases/rust.py
@@ -0,0 +1,33 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+import os
+import shutil
+import unittest
+
+from oeqa.core.utils.path import remove_safe
+from oeqa.sdk.case import OESDKTestCase
+
+from oeqa.utils.subprocesstweak import errors_have_output
+errors_have_output()
+
+class RustCompileTest(OESDKTestCase):
+    td_vars = ['MACHINE']
+
+    @classmethod
+    def setUpClass(self):
+        targetdir = os.path.join(self.tc.sdk_dir, "hello")
+        try:
+            os.removedirs(targetdir)
+        except OSError:
+            pass
+        shutil.copytree(os.path.join(self.tc.sdk_files_dir, "rust/hello"), targetdir)
+
+    def setUp(self):
+        machine = self.td.get("MACHINE")
+        if not self.tc.hasHostPackage("packagegroup-rust-cross-canadian-%s" % machine):
+            raise unittest.SkipTest("RustCompileTest class: SDK doesn't contain a Rust cross-canadian toolchain")
+
+    def test_cargo_build(self):
+        self._run('cd %s/hello; cargo build' % self.tc.sdk_dir)
diff --git a/meta/lib/oeqa/sdk/files/rust/hello/Cargo.toml b/meta/lib/oeqa/sdk/files/rust/hello/Cargo.toml
new file mode 100644
index 00000000000..fe619478a68
--- /dev/null
+++ b/meta/lib/oeqa/sdk/files/rust/hello/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "hello"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/meta/lib/oeqa/sdk/files/rust/hello/src/main.rs b/meta/lib/oeqa/sdk/files/rust/hello/src/main.rs
new file mode 100644
index 00000000000..a06c03f82ae
--- /dev/null
+++ b/meta/lib/oeqa/sdk/files/rust/hello/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, OpenEmbedded world!");
+}
-- 
2.34.1

Re: [OE-core] [PATCH 2/3] oeqa/sdk: Add basic rust cargo test

[Luca Ceresoli]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

Hello Richard,

On Tue, 26 Jul 2022 15:24:12 +0100
"Richard Purdie" <richard.purdie@linuxfoundation.org> wrote:

> From: Otavio Salvador <otavio@ossystems.com.br>
> 
> Add a QA test to the SDK to test that a basic cargo build works.
> 
> [RP: Tweaked to work for multilibs and updated to match toolchain changes]
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

We have a build failure with this series applied:

https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/5615/steps/26/logs/stdio

Attached is the do_testsdk log.

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: log.do_testsdk.37977 --]
[-- Type: application/octet-stream, Size: 9056 bytes --]

DEBUG: Executing python function do_testsdk
/home/pokybuild/yocto-worker/multilib/build/meta/lib/oeqa/sdk/testsdk.py:88: ResourceWarning: unclosed file <_io.TextIOWrapper name='/home/pokybuild/yocto-worker/multilib/build/build/tmp/deploy/sdk/poky-glibc-x86_64-core-image-minimal-mips64-n32-qemumips64-toolchain-4.1+snapshot.testdata.json' mode='r' encoding='UTF-8'>
  test_data = json.load(open(tdname, "r"))
ResourceWarning: Enable tracemalloc to get the object allocation traceback
/usr/lib/python3.10/site-packages/testtools/distutilscmd.py:7: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  from distutils.core import Command
SDK testing environment: mips32r2-pokymllib32-linux
NOTE: test_assimp (assimp.BuildAssimp)
NOTE:  ... ok
NOTE: test_cpio (buildcpio.BuildCpioTest)
NOTE:  ... ok
NOTE: test_epoxy (buildepoxy.EpoxyTest)
NOTE:  ... ok
NOTE: test_galculator (buildgalculator.GalculatorTest)
NOTE:  ... skipped "GalculatorTest class: SDK don't support gtk+3"
GalculatorTest class: SDK don't support gtk+3
NOTE: test_lzip (buildlzip.BuildLzipTest)
NOTE:  ... ok
NOTE: test_gcc_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_gpp2_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_gpp_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_make (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_perl (perl.PerlTest)
NOTE:  ... ok
NOTE: test_python3 (python.Python3Test)
NOTE:  ... ok
NOTE: test_cargo_build (rust.RustCompileTest)
NOTE:  ... skipped "RustCompileTest class: SDK doesn't contain a Rust cross-canadian toolchain"
RustCompileTest class: SDK doesn't contain a Rust cross-canadian toolchain
NOTE: ----------------------------------------------------------------------
NOTE: Ran 12 tests in 206.667s
NOTE: OK
NOTE:  (skipped=2)
RESULTS:
RESULTS - assimp.BuildAssimp.test_assimp: PASSED (112.51s)
RESULTS - buildcpio.BuildCpioTest.test_cpio: PASSED (39.51s)
RESULTS - buildepoxy.EpoxyTest.test_epoxy: PASSED (49.89s)
RESULTS - buildlzip.BuildLzipTest.test_lzip: PASSED (3.72s)
RESULTS - gcc.GccCompileTest.test_gcc_compile: PASSED (0.14s)
RESULTS - gcc.GccCompileTest.test_gpp2_compile: PASSED (0.19s)
RESULTS - gcc.GccCompileTest.test_gpp_compile: PASSED (0.46s)
RESULTS - gcc.GccCompileTest.test_make: PASSED (0.13s)
RESULTS - perl.PerlTest.test_perl: PASSED (0.02s)
RESULTS - python.Python3Test.test_python3: PASSED (0.04s)
RESULTS - buildgalculator.GalculatorTest.test_galculator: SKIPPED (0.00s)
RESULTS - rust.RustCompileTest.test_cargo_build: SKIPPED (0.00s)
SUMMARY:
core-image-minimal sdk (poky-glibc-x86_64-core-image-minimal-mips64-n32-qemumips64-toolchain-4.1+snapshot.sh:environment-setup-mips32r2-pokymllib32-linux) - Ran 12 tests in 206.667s
core-image-minimal sdk - OK - All required tests passed (successes=10, skipped=2, failures=0, errors=0)
SDK testing environment: mips64-pokymllib64-linux
NOTE: test_assimp (assimp.BuildAssimp)
NOTE:  ... ok
NOTE: test_cpio (buildcpio.BuildCpioTest)
NOTE:  ... ok
NOTE: test_epoxy (buildepoxy.EpoxyTest)
NOTE:  ... ok
NOTE: test_galculator (buildgalculator.GalculatorTest)
NOTE:  ... skipped "GalculatorTest class: SDK don't support gtk+3"
GalculatorTest class: SDK don't support gtk+3
NOTE: test_lzip (buildlzip.BuildLzipTest)
NOTE:  ... ok
NOTE: test_gcc_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_gpp2_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_gpp_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_make (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_perl (perl.PerlTest)
NOTE:  ... ok
NOTE: test_python3 (python.Python3Test)
NOTE:  ... ok
NOTE: ERROR
NOTE: ======================================================================
NOTE: ERROR: setUpClass (rust.RustCompileTest)
NOTE: ----------------------------------------------------------------------
NOTE: Traceback (most recent call last):
  File "/home/pokybuild/yocto-worker/multilib/build/meta/lib/oeqa/core/case.py", line 39, in _oeSetUpClass
    clss.setUpClassMethod()
  File "/home/pokybuild/yocto-worker/multilib/build/meta/lib/oeqa/sdk/cases/rust.py", line 25, in setUpClass
    shutil.copytree(os.path.join(self.tc.sdk_files_dir, "rust/hello"), targetdir)
  File "/usr/lib64/python3.10/shutil.py", line 558, in copytree
    return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
  File "/usr/lib64/python3.10/shutil.py", line 457, in _copytree
    os.makedirs(dst, exist_ok=dirs_exist_ok)
  File "/usr/lib64/python3.10/os.py", line 225, in makedirs
    mkdir(name, mode)
FileExistsError: [Errno 17] File exists: '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemumips64-poky-linux-gnun32/core-image-minimal/1.0-r0/testimage-sdk/hello'

NOTE: ----------------------------------------------------------------------
NOTE: Ran 11 tests in 215.552s
NOTE: FAILED
NOTE:  (errors=1, skipped=1)
RESULTS:
RESULTS - assimp.BuildAssimp.test_assimp: PASSED (141.45s)
RESULTS - buildcpio.BuildCpioTest.test_cpio: PASSED (39.05s)
RESULTS - buildepoxy.EpoxyTest.test_epoxy: PASSED (30.50s)
RESULTS - buildlzip.BuildLzipTest.test_lzip: PASSED (3.56s)
RESULTS - gcc.GccCompileTest.test_gcc_compile: PASSED (0.13s)
RESULTS - gcc.GccCompileTest.test_gpp2_compile: PASSED (0.20s)
RESULTS - gcc.GccCompileTest.test_gpp_compile: PASSED (0.50s)
RESULTS - gcc.GccCompileTest.test_make: PASSED (0.12s)
RESULTS - perl.PerlTest.test_perl: PASSED (0.02s)
RESULTS - python.Python3Test.test_python3: PASSED (0.03s)
RESULTS - buildgalculator.GalculatorTest.test_galculator: SKIPPED (0.00s)
RESULTS - rust.RustCompileTest.test_cargo_build: ERROR
SUMMARY:
core-image-minimal sdk (poky-glibc-x86_64-core-image-minimal-mips64-n32-qemumips64-toolchain-4.1+snapshot.sh:environment-setup-mips64-pokymllib64-linux) - Ran 11 tests in 215.553s
core-image-minimal sdk - FAIL - Required tests failed (successes=10, skipped=1, failures=0, errors=1)
SDK testing environment: mips64-n32-poky-linux-gnun32
NOTE: test_assimp (assimp.BuildAssimp)
NOTE:  ... ok
NOTE: test_cpio (buildcpio.BuildCpioTest)
NOTE:  ... ok
NOTE: test_epoxy (buildepoxy.EpoxyTest)
NOTE:  ... ok
NOTE: test_galculator (buildgalculator.GalculatorTest)
NOTE:  ... skipped "GalculatorTest class: SDK don't support gtk+3"
GalculatorTest class: SDK don't support gtk+3
NOTE: test_lzip (buildlzip.BuildLzipTest)
NOTE:  ... ok
NOTE: test_gcc_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_gpp2_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_gpp_compile (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_make (gcc.GccCompileTest)
NOTE:  ... ok
NOTE: test_perl (perl.PerlTest)
NOTE:  ... ok
NOTE: test_python3 (python.Python3Test)
NOTE:  ... ok
NOTE: ERROR
NOTE: ======================================================================
NOTE: ERROR: setUpClass (rust.RustCompileTest)
NOTE: ----------------------------------------------------------------------
NOTE: Traceback (most recent call last):
  File "/home/pokybuild/yocto-worker/multilib/build/meta/lib/oeqa/core/case.py", line 39, in _oeSetUpClass
    clss.setUpClassMethod()
  File "/home/pokybuild/yocto-worker/multilib/build/meta/lib/oeqa/sdk/cases/rust.py", line 25, in setUpClass
    shutil.copytree(os.path.join(self.tc.sdk_files_dir, "rust/hello"), targetdir)
  File "/usr/lib64/python3.10/shutil.py", line 558, in copytree
    return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
  File "/usr/lib64/python3.10/shutil.py", line 457, in _copytree
    os.makedirs(dst, exist_ok=dirs_exist_ok)
  File "/usr/lib64/python3.10/os.py", line 225, in makedirs
    mkdir(name, mode)
FileExistsError: [Errno 17] File exists: '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemumips64-poky-linux-gnun32/core-image-minimal/1.0-r0/testimage-sdk/hello'

NOTE: ----------------------------------------------------------------------
NOTE: Ran 11 tests in 198.460s
NOTE: FAILED
NOTE:  (errors=1, skipped=1)
RESULTS:
RESULTS - assimp.BuildAssimp.test_assimp: PASSED (133.66s)
RESULTS - buildcpio.BuildCpioTest.test_cpio: PASSED (30.98s)
RESULTS - buildepoxy.EpoxyTest.test_epoxy: PASSED (29.42s)
RESULTS - buildlzip.BuildLzipTest.test_lzip: PASSED (3.36s)
RESULTS - gcc.GccCompileTest.test_gcc_compile: PASSED (0.11s)
RESULTS - gcc.GccCompileTest.test_gpp2_compile: PASSED (0.22s)
RESULTS - gcc.GccCompileTest.test_gpp_compile: PASSED (0.51s)
RESULTS - gcc.GccCompileTest.test_make: PASSED (0.15s)
RESULTS - perl.PerlTest.test_perl: PASSED (0.02s)
RESULTS - python.Python3Test.test_python3: PASSED (0.04s)
RESULTS - buildgalculator.GalculatorTest.test_galculator: SKIPPED (0.00s)
RESULTS - rust.RustCompileTest.test_cargo_build: ERROR
SUMMARY:
core-image-minimal sdk (poky-glibc-x86_64-core-image-minimal-mips64-n32-qemumips64-toolchain-4.1+snapshot.sh:environment-setup-mips64-n32-poky-linux-gnun32) - Ran 11 tests in 198.461s
core-image-minimal sdk - FAIL - Required tests failed (successes=10, skipped=1, failures=0, errors=1)
ERROR: core-image-minimal - FAILED - check the task log and the commands log
DEBUG: Python function do_testsdk finished

Re: [OE-core] [PATCH 2/3] oeqa/sdk: Add basic rust cargo test

[Otavio Salvador]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

Em qua., 27 de jul. de 2022 às 13:48, Luca Ceresoli via
lists.openembedded.org <luca.ceresoli=bootlin.com@lists.openembedded.org>
escreveu:

> On Tue, 26 Jul 2022 15:24:12 +0100
> "Richard Purdie" <richard.purdie@linuxfoundation.org> wrote:
>
> > From: Otavio Salvador <otavio@ossystems.com.br>
> >
> > Add a QA test to the SDK to test that a basic cargo build works.
> >
> > [RP: Tweaked to work for multilibs and updated to match toolchain
> changes]
> >
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> We have a build failure with this series applied:
>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/5615/steps/26/logs/stdio
>
> Attached is the do_testsdk log.
>

It seems the SDK test directory is being reused, so it failed as file
already exists.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

[-- Attachment #2: Type: text/html, Size: 2162 bytes --]

[PATCH 3/3] populate_sdk: Add SDK toolchain language selection support

[Richard Purdie]

Add a new variable SDK_TOOLCHAIN_LANGS to allow different laguage support
to be selected within SDKs. Initially supported options are rust and go.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/populate_sdk_base.bbclass | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 16f929bf596..bbca4cedadb 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -43,9 +43,22 @@ B:task-populate-sdk = "${SDK_DIR}"
 
 SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
 
-TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}"
+SDK_TOOLCHAIN_LANGS ??= ""
+SDK_TOOLCHAIN_LANGS:remove:mingw32 = "rust"
+
+TOOLCHAIN_HOST_TASK ?= " \
+    nativesdk-packagegroup-sdk-host \
+    packagegroup-cross-canadian-${MACHINE} \
+    ${@bb.utils.contains('SDK_TOOLCHAIN_LANGS', 'go', 'packagegroup-go-cross-canadian-${MACHINE}', '', d)} \
+    ${@bb.utils.contains('SDK_TOOLCHAIN_LANGS', 'rust', 'packagegroup-rust-cross-canadian-${MACHINE}', '', d)} \
+"
 TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
-TOOLCHAIN_TARGET_TASK ?= "${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} target-sdk-provides-dummy"
+TOOLCHAIN_TARGET_TASK ?= " \
+    ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} \
+    ${@bb.utils.contains('SDK_TOOLCHAIN_LANGS', 'go', multilib_pkg_extend(d, 'packagegroup-go-sdk-target'), '', d)} \
+    ${@bb.utils.contains('SDK_TOOLCHAIN_LANGS', 'rust', multilib_pkg_extend(d, 'libstd-rs'), '', d)} \
+    target-sdk-provides-dummy \
+"
 TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
 
-- 
2.34.1