From patchwork Tue Oct 3 07:06:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 31597 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 2FA5CE75432 for ; Tue, 3 Oct 2023 07:06:56 +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.102813.1696316807532956660 for ; Tue, 03 Oct 2023 00:06:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@geanix.com header.s=default2211 header.b=fq6vPdr/; 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=fq6vPdr/LY0ZXpCz9wQSFIgRwO zb9sDS9hGxb+NmSq3aXcUxpYEFbDkDjHoFGoPWRpIIsYhV63VdTqZe2JvxQMXCuRfzx0+fUXfc7t9 GDKudQZfhTn7yND26L4qHo/lBgi3PEdiGIQDMuZHK9LFYLMkmrXr7qi7JndCpmrsy1htuDqFk3snX BjT8xsCzkCW9ni6ZFF6p6HmDPacb0fa5iZCWDCDWNE19VuEC+DRA6izXK6Sw6HNkGO4S18U3HFUOI GUYlaFUy1VJHTTyltD3DxP5rKE0L3qjZ3bsZszbCyr582KFCa5eSpaCRX01NljGC4kbKPy0pG9viT 2H8kLV0g==; Received: from sslproxy02.your-server.de ([78.47.166.47]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qnZUS-000PJi-FL; Tue, 03 Oct 2023 09:06:44 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qnZUS-000Nnw-6O; Tue, 03 Oct 2023 09:06:44 +0200 From: Sean Nyekjaer To: openembedded-core@lists.openembedded.org Cc: Sean Nyekjaer , kasper@krinvent.dk Subject: [OE-core][PATCH v2 1/3] rust-cross-canadian: set CARGO_TARGET__RUSTFLAGS Date: Tue, 3 Oct 2023 09:06:28 +0200 Message-ID: <20231003070632.1040011-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/27049/Mon Oct 2 09:37:00 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 ; Tue, 03 Oct 2023 07:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188625 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 Tue Oct 3 07:06:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 31598 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 3065AE75434 for ; Tue, 3 Oct 2023 07:06:56 +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.102812.1696316807491341156 for ; Tue, 03 Oct 2023 00:06:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@geanix.com header.s=default2211 header.b=ejP3STVF; 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=ejP3STVFlLn2KbIkdDhIz4MzDP QIvCDq7ckBCb7yld0p8BnU9lx6hER5gCxqdjFhRZ9b9IvUh2SBXW8qxnwvHnSBPqYfi16I49C9dX+ TdpGTjo0hWINFr+1/jPNzTTguSfbxQKx37suQIt7/8cC6xAc7oU7OGJW1mSdQA8lHnfCk26YlG7UC ndFkivFQRHoAkxM+awg0kJ/C4w46nIaUY/7CmdSOkCkxC/LwQW4RII8ZbtVZ+/tMvODxLHS9GXR+t GP7aTXHH1DmwRFnMC2OB9hsSA5lRafDWvwDEuCCkGdG3FtjhDXnQdS6QPqmxLOG2+6fhBje5OtWgD MDzHZuNw==; Received: from sslproxy02.your-server.de ([78.47.166.47]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qnZUS-000PJj-Ip; Tue, 03 Oct 2023 09:06:44 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qnZUS-000Nnw-AK; Tue, 03 Oct 2023 09:06:44 +0200 From: Sean Nyekjaer To: openembedded-core@lists.openembedded.org Cc: Sean Nyekjaer , kasper@krinvent.dk Subject: [OE-core][PATCH v2 2/3] rust-cross-canadian: set CARGO_TARGET__RUNNER for nativesdk Date: Tue, 3 Oct 2023 09:06:29 +0200 Message-ID: <20231003070632.1040011-2-sean@geanix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231003070632.1040011-1-sean@geanix.com> References: <20231003070632.1040011-1-sean@geanix.com> MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27049/Mon Oct 2 09:37:00 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 ; Tue, 03 Oct 2023 07:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188626 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 Tue Oct 3 07:06:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 31596 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 2FE2DE7542F for ; Tue, 3 Oct 2023 07:06:56 +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.102811.1696316807303624294 for ; Tue, 03 Oct 2023 00:06:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@geanix.com header.s=default2211 header.b=O2Sj8Dn3; 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=HSz8acKngEwbGEcaO6UoprHE9j9daMMJRC3QHN9jdzc=; b=O2Sj8Dn32h0LT+aHL4OIk+nqfG CmtOc100ZLCT/dAEX93rZHhe6Z531v2+YOvaIgtX3TI8irGewTjt/f7MrQf/mk05j3MEVxPhw5zrf SrbkO6vEty6AEEALrjRbxlHlRmddKdoko5x/dFSGeW8E9qux4eF1+MCgaPPkvZxSb3drGyAoR7GPK J7N+5HDsjb5bpfFEFy7xAOo7djeRsLVGjbbvhF6iBVjYMADNOcwsrbwtr3M2ncdR2yP+r4wS+MXd1 /etSt++zUD65aRB4ffUX4DyLeoWGwW/4036B+JfmLGSF5LIS0ESewtvWFmftU7r8No6JZwcT0I5/v FmeEa0uQ==; Received: from sslproxy02.your-server.de ([78.47.166.47]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qnZUS-000PJl-Ot; Tue, 03 Oct 2023 09:06:44 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qnZUS-000Nnw-F0; Tue, 03 Oct 2023 09:06:44 +0200 From: Sean Nyekjaer To: openembedded-core@lists.openembedded.org Cc: Sean Nyekjaer , kasper@krinvent.dk Subject: [OE-core][PATCH v2 3/3] oeqa/sdk/rust: Add build and run test of rust binary with SDK host Date: Tue, 3 Oct 2023 09:06:30 +0200 Message-ID: <20231003070632.1040011-3-sean@geanix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231003070632.1040011-1-sean@geanix.com> References: <20231003070632.1040011-1-sean@geanix.com> MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27049/Mon Oct 2 09:37:00 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 ; Tue, 03 Oct 2023 07:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188627 Add a QA test to the SDK to test that a basic cargo build works for the SDK host. Signed-off-by: Sean Nyekjaer --- Changes since v1: - use SDK_SYS for compiling for SDK Host 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..f5d437bb19 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', 'SDK_SYS'] + + @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): + sdksys = self.td.get("SDK_SYS") + self._run('cd %s/hello; cargo build --target %s-gnu' % (self.tc.sdk_dir, sdksys)) + self._run('cd %s/hello; cargo run --target %s-gnu' % (self.tc.sdk_dir, sdksys))