diff options
author | Frederic Martinsons <frederic.martinsons@gmail.com> | 2023-08-02 15:16:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-09 13:22:00 +0100 |
commit | e9a09c8012931c8b4b22cb1de3fc7d967af11f0a (patch) | |
tree | f39df442884f4ef7016f43a6537c5ae96a408e85 | |
parent | 2dd04232e77c88a251c19e60f148f6a0fe02e691 (diff) | |
download | poky-e9a09c8012931c8b4b22cb1de3fc7d967af11f0a.tar.gz |
rust-hello-world: Drop recipe
we now have more rust/cargo recipes and tests that cover various use cases
so this is no longer needed.
(From OE-Core rev: 8baaf94d200f5355791ecd980727698b1ab0e539)
Signed-off-by: Frederic Martinsons <frederic.martinsons@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 files changed, 0 insertions, 59 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 1c9c5616d8..202e5739a0 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -734,7 +734,6 @@ RECIPE_MAINTAINER:pn-ruby = "Ross Burton <ross.burton@arm.com>" | |||
734 | RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" | 734 | RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" |
735 | RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 735 | RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
736 | RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 736 | RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
737 | RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod <Randy.MacLeod@windriver.com>" | ||
738 | RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 737 | RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
739 | RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>" | 738 | RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>" |
740 | RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>" | 739 | RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>" |
diff --git a/meta/lib/oeqa/runtime/cases/rust.py b/meta/lib/oeqa/runtime/cases/rust.py index c9c60e16fd..9bf0312669 100644 --- a/meta/lib/oeqa/runtime/cases/rust.py +++ b/meta/lib/oeqa/runtime/cases/rust.py | |||
@@ -48,15 +48,3 @@ class RustCompileTest(OERuntimeTestCase): | |||
48 | status, output = self.target.run('cargo run --manifest-path=/tmp/hello/Cargo.toml') | 48 | status, output = self.target.run('cargo run --manifest-path=/tmp/hello/Cargo.toml') |
49 | msg = 'running compiled file failed, output: %s' % output | 49 | msg = 'running compiled file failed, output: %s' % output |
50 | self.assertEqual(status, 0, msg=msg) | 50 | self.assertEqual(status, 0, msg=msg) |
51 | |||
52 | class RustHelloworldTest(OERuntimeTestCase): | ||
53 | @OETestDepends(['ssh.SSHTest.test_ssh']) | ||
54 | @OEHasPackage(['rust-hello-world']) | ||
55 | def test_rusthelloworld(self): | ||
56 | cmd = "rust-hello-world" | ||
57 | status, output = self.target.run(cmd) | ||
58 | msg = 'Exit status was not 0. Output: %s' % output | ||
59 | self.assertEqual(status, 0, msg=msg) | ||
60 | |||
61 | msg = 'Incorrect output: %s' % output | ||
62 | self.assertEqual(output, "Hello, world!", msg=msg) | ||
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index e05e329020..1fee1c925d 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | |||
@@ -25,8 +25,6 @@ GOTOOLS ?= "go-helloworld" | |||
25 | GOTOOLS:powerpc ?= "" | 25 | GOTOOLS:powerpc ?= "" |
26 | GOTOOLS:riscv32 ?= "" | 26 | GOTOOLS:riscv32 ?= "" |
27 | 27 | ||
28 | RUSTTOOLS ?= "rust-hello-world" | ||
29 | |||
30 | GSTEXAMPLES ?= "gst-examples" | 28 | GSTEXAMPLES ?= "gst-examples" |
31 | GSTEXAMPLES:riscv64 = "" | 29 | GSTEXAMPLES:riscv64 = "" |
32 | 30 | ||
@@ -59,5 +57,4 @@ RDEPENDS:${PN} = "\ | |||
59 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \ | 57 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \ |
60 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \ | 58 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \ |
61 | ${GOTOOLS} \ | 59 | ${GOTOOLS} \ |
62 | ${RUSTTOOLS} \ | ||
63 | " | 60 | " |
diff --git a/meta/recipes-extended/rust-example/rust-hello-world/0001-enable-LTO.patch b/meta/recipes-extended/rust-example/rust-hello-world/0001-enable-LTO.patch deleted file mode 100644 index f319545ee1..0000000000 --- a/meta/recipes-extended/rust-example/rust-hello-world/0001-enable-LTO.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From fa40b874f6470ec11a8fd7b0c9909d0cdd2d6feb Mon Sep 17 00:00:00 2001 | ||
2 | From: Dan Callaghan <dan.callaghan@opengear.com> | ||
3 | Date: Fri, 5 Feb 2021 08:56:34 +1000 | ||
4 | Subject: [PATCH] enable LTO | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | --- | ||
8 | Cargo.toml | 3 +++ | ||
9 | 1 file changed, 3 insertions(+) | ||
10 | |||
11 | diff --git a/Cargo.toml b/Cargo.toml | ||
12 | index 7a2f6c8..cdb6b5d 100644 | ||
13 | --- a/Cargo.toml | ||
14 | +++ b/Cargo.toml | ||
15 | @@ -3,3 +3,6 @@ | ||
16 | name = "rust-hello-world" | ||
17 | version = "0.0.1" | ||
18 | authors = ["Cody P Schafer <dev@codyps.com>"] | ||
19 | + | ||
20 | +[profile.release] | ||
21 | +lto = true | ||
22 | -- | ||
23 | 2.28.0 | ||
24 | |||
diff --git a/meta/recipes-extended/rust-example/rust-hello-world_git.bb b/meta/recipes-extended/rust-example/rust-hello-world_git.bb deleted file mode 100644 index 1d91109b51..0000000000 --- a/meta/recipes-extended/rust-example/rust-hello-world_git.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | inherit cargo | ||
2 | |||
3 | SRC_URI = "git://github.com/meta-rust/rust-hello-world.git;protocol=https;branch=master" | ||
4 | SRCREV="e0fa23f1a3cb1eb1407165bd2fc36d2f6e6ad728" | ||
5 | LIC_FILES_CHKSUM="file://COPYRIGHT;md5=e6b2207ac3740d2d01141c49208c2147" | ||
6 | |||
7 | SRC_URI += "\ | ||
8 | file://0001-enable-LTO.patch \ | ||
9 | " | ||
10 | |||
11 | UPSTREAM_CHECK_COMMITS = "1" | ||
12 | |||
13 | SUMMARY = "Hello World by Cargo for Rust" | ||
14 | HOMEPAGE = "https://github.com/meta-rust/rust-hello-world" | ||
15 | LICENSE = "MIT | Apache-2.0" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | BBCLASSEXTEND = "native" | ||