From patchwork Fri Sep 29 10:19:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 31348 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0B71E7F153 for ; Fri, 29 Sep 2023 10:20:06 +0000 (UTC) Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) by mx.groups.io with SMTP id smtpd.web11.14115.1695982796974962269 for ; Fri, 29 Sep 2023 03:19:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@geanix.com header.s=default2211 header.b=I7k34PGl; spf=pass (domain: geanix.com, ip: 188.40.30.78, mailfrom: sean@geanix.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=7qaREPnWPCoM82eXEXvpc1UVBL8vlUYgDUw33uG6yP8=; b=I7k34PGliONsKF+lfEKhs/9RUv poGgR1dfouTtIQPo2qOnccJypcKKRSdYK+NgZjsxlZe7WfPF0AC6XkI4tKGeor30gfck/x3RBNbIz QRN0D1DljEz30xLoOewomfzKHW9o9OOtuvjd9bkGWbGZnvk1k9OVAHRCxrBY3RY8hmrm8UQMoVIZP sRh5+Ia58xqp1YjoqVAdMXgcVAcRdY7IbyDlGlr7G4yOxGZ88D651yylWbrGFImOSj//gSy+hPXyo H9TzoZ4dBTW35bTC6jtiU4kx87c5XPTOvlv4sfnKjy2Vc94REagz46xEkCHAQe+l2uICmfUEm+50M I9B/bV+A==; Received: from sslproxy01.your-server.de ([78.46.139.224]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qmAbC-000EYG-5J; Fri, 29 Sep 2023 12:19:54 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy01.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qmAbB-000MOV-Tz; Fri, 29 Sep 2023 12:19:53 +0200 From: Sean Nyekjaer To: openembedded-core@lists.openembedded.org Cc: Sean Nyekjaer , kasper@krinvent.dk Subject: [OE-core][PATCH 1/3] rust-cross-canadian: set CARGO_TARGET__RUSTFLAGS Date: Fri, 29 Sep 2023 12:19:21 +0200 Message-ID: <20230929101925.1442545-1-sean@geanix.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27046/Fri Sep 29 09:41:56 2023) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Sep 2023 10:20:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188399 Avoid setting sdk-wide RUSTFLAGS as these flags only are valid when building for target. This will enable building for different targets with different RUSTFLAGS. Signed-off-by: Sean Nyekjaer --- meta/recipes-devtools/rust/rust-cross-canadian.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index d569ac59f5..d25646237c 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -54,8 +54,10 @@ do_install () { mkdir "${ENV_SETUP_DIR}" RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh" + RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'` + cat <<- EOF > "${RUST_ENV_SETUP_SH}" - export RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT" + export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT" export RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib" EOF From patchwork Fri Sep 29 10:19:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 31347 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6B37E7F156 for ; Fri, 29 Sep 2023 10:20:06 +0000 (UTC) Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) by mx.groups.io with SMTP id smtpd.web11.14116.1695982797250523566 for ; Fri, 29 Sep 2023 03:19:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@geanix.com header.s=default2211 header.b=lloqF+mR; spf=pass (domain: geanix.com, ip: 188.40.30.78, mailfrom: sean@geanix.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID; bh=TetLa8yIJ40GrgWyOdxvtyUvKYfr61F6OmAb2/Wdnkc=; b=lloqF+mRYiEbM73YKG/puL74Dl ve8SGcc10mX1hFCwc1MlKQjXzb+Ykg+YI1OVAmhA8DkjRnUW7b4XUyE9ueMFQeV/9rJjyX/XZMBZe btpYLE1E9S5d/EJX9Kf1T7WHJCYsCXf+VaYXThc4qZQWoTh+aUbRdC7G1AybNkwaIaweuqeCYAHdo bJz7Px/Ra2/jX93ODTJApvmsMNrS7j066VSXUcBSoaesFipfvhBYLphOKXfwayYxXMJedqf/xOGmk Jm81kXRaJ7AdUz4F/igY0TxTCn8szc9r+iZQ2wO0ix0ZvZaO6Q9SzD69mBC1GGpdwfHqvoBUuYH/z boMWoz+Q==; Received: from sslproxy01.your-server.de ([78.46.139.224]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qmAbC-000EYH-9G; Fri, 29 Sep 2023 12:19:54 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy01.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qmAbC-000MOV-1s; Fri, 29 Sep 2023 12:19:54 +0200 From: Sean Nyekjaer To: openembedded-core@lists.openembedded.org Cc: Sean Nyekjaer , kasper@krinvent.dk Subject: [OE-core][PATCH 2/3] rust-cross-canadian: set CARGO_TARGET__RUNNER for nativesdk Date: Fri, 29 Sep 2023 12:19:22 +0200 Message-ID: <20230929101925.1442545-2-sean@geanix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230929101925.1442545-1-sean@geanix.com> References: <20230929101925.1442545-1-sean@geanix.com> MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27046/Fri Sep 29 09:41:56 2023) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Sep 2023 10:20:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188397 This will enable us to build and run rust programs on the sdk host. % cargo run --target x86_64-oesdk-linux-gnu -vv Fresh hello v0.1.0 (~/development/hello) Finished dev [unoptimized + debuginfo] target(s) in 0.02s Running `/usr/local/sdk/sysroots/x86_64-oesdk-linux/lib/ld-linux-x86-64.so.2 target/x86_64-oesdk-linux-gnu/debug/hello` Hello, world Signed-off-by: Sean Nyekjaer --- meta/recipes-devtools/rust/rust-cross-canadian.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index d25646237c..5b89216658 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -55,9 +55,12 @@ do_install () { RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh" RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'` + RUST_HOST_TRIPLE=`echo ${RUST_HOST_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'` + SDKARCH=`echo ${SDK_ARCH} | sed 's/_/-/g'` cat <<- EOF > "${RUST_ENV_SETUP_SH}" export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT" + export CARGO_TARGET_${RUST_HOST_TRIPLE}_RUNNER="\$OECORE_NATIVE_SYSROOT/lib/ld-linux-${SDKARCH}.so.2" export RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib" EOF From patchwork Fri Sep 29 10:19:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 31346 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5125E732D0 for ; Fri, 29 Sep 2023 10:20:06 +0000 (UTC) Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) by mx.groups.io with SMTP id smtpd.web11.14117.1695982797359549279 for ; Fri, 29 Sep 2023 03:19:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@geanix.com header.s=default2211 header.b=o6wvuFnp; spf=pass (domain: geanix.com, ip: 188.40.30.78, mailfrom: sean@geanix.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID; bh=jdgX0+DILbkxcZFbJQb93uQ6wgLo6ZnUCVkx3ZV5fAY=; b=o6wvuFnpe7yQ6F1E9vUr86cV1b B20HQv9wewWjoBxgbh+0ZD+eGHoVx8cHjjlKqyHWCTGrEmz+xbkkx7UL/5Z0Cnx4PfLv+Lu2VBKzh 10jUU5I9lSYysscdRDghr8pLyd3LNcWP7Kfwqdq62+bZUQJAFg2k/x5OPmy+oIOc3+7UiMoOhpsrH CsBqXuh0H0XV1tcxPBmrt2zYvBZ0nPIxe39t8yBczNySYGt8lke8vO0wd8p3j/3ty99dbBQFUN18I IDUy2VZyi7BLfowrzgojnpJ5NK02hS8H8FbrH3+/5dSvOZhqkKAdBLod7oVLWq1Zl0eSL+NoRTEy4 ZdYStItw==; Received: from sslproxy01.your-server.de ([78.46.139.224]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qmAbC-000EYK-Eh; Fri, 29 Sep 2023 12:19:54 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy01.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qmAbC-000MOV-6h; Fri, 29 Sep 2023 12:19:54 +0200 From: Sean Nyekjaer To: openembedded-core@lists.openembedded.org Cc: Sean Nyekjaer , kasper@krinvent.dk, alex.kanavin@gmail.com Subject: [OE-core][PATCH 3/3] oeqa/sdk/rust: Add build and run test of rust binary with SDK host Date: Fri, 29 Sep 2023 12:19:23 +0200 Message-ID: <20230929101925.1442545-3-sean@geanix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230929101925.1442545-1-sean@geanix.com> References: <20230929101925.1442545-1-sean@geanix.com> MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27046/Fri Sep 29 09:41:56 2023) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Sep 2023 10:20:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188398 Add a QA test to the SDK to test that a basic cargo build works for the SDK host. Signed-off-by: Sean Nyekjaer --- I know that `cargo build` and `cargo run` is kinda redundant for the `cargo run` command. But I guess it's easier to see whats happening here... meta/lib/oeqa/sdk/cases/rust.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta/lib/oeqa/sdk/cases/rust.py b/meta/lib/oeqa/sdk/cases/rust.py index 31036f0f14..9404078b1d 100644 --- a/meta/lib/oeqa/sdk/cases/rust.py +++ b/meta/lib/oeqa/sdk/cases/rust.py @@ -33,3 +33,25 @@ class RustCompileTest(OESDKTestCase): def test_cargo_build(self): self._run('cd %s/hello; cargo build' % self.tc.sdk_dir) + +class RustHostCompileTest(OESDKTestCase): + td_vars = ['MACHINE', 'SDKMACHINE'] + + @classmethod + def setUpClass(self): + targetdir = os.path.join(self.tc.sdk_dir, "hello") + try: + shutil.rmtree(targetdir) + except FileNotFoundError: + 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): + machine = self.td.get("SDKMACHINE") + self._run('cd %s/hello; cargo build --target %s-oesdk-linux-gnu' % (self.tc.sdk_dir, machine)) + self._run('cd %s/hello; cargo run --target %s-oesdk-linux-gnu' % (self.tc.sdk_dir, machine))