From: Frederic Martinsons <[email protected]> we now have more rust/cargo recipes and test that covers various use cases.
Signed-off-by: Frederic Martinsons <[email protected]> --- meta/conf/distro/include/maintainers.inc | 1 - meta/lib/oeqa/runtime/cases/rust.py | 12 ---------- .../packagegroup-core-tools-testapps.bb | 3 --- .../rust-hello-world/0001-enable-LTO.patch | 24 ------------------- .../rust-example/rust-hello-world_git.bb | 19 --------------- 5 files changed, 59 deletions(-) delete mode 100644 meta/recipes-extended/rust-example/rust-hello-world/0001-enable-LTO.patch delete mode 100644 meta/recipes-extended/rust-example/rust-hello-world_git.bb 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 <[email protected]>" RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <[email protected]>" RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <[email protected]>" -RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod <[email protected]>" RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <[email protected]>" RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <[email protected]>" 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): status, output = self.target.run('cargo run --manifest-path=/tmp/hello/Cargo.toml') msg = 'running compiled file failed, output: %s' % output self.assertEqual(status, 0, msg=msg) - -class RustHelloworldTest(OERuntimeTestCase): - @OETestDepends(['ssh.SSHTest.test_ssh']) - @OEHasPackage(['rust-hello-world']) - def test_rusthelloworld(self): - cmd = "rust-hello-world" - status, output = self.target.run(cmd) - msg = 'Exit status was not 0. Output: %s' % output - self.assertEqual(status, 0, msg=msg) - - msg = 'Incorrect output: %s' % output - 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" GOTOOLS:powerpc ?= "" GOTOOLS:riscv32 ?= "" -RUSTTOOLS ?= "rust-hello-world" - GSTEXAMPLES ?= "gst-examples" GSTEXAMPLES:riscv64 = "" @@ -59,5 +57,4 @@ RDEPENDS:${PN} = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \ ${GOTOOLS} \ - ${RUSTTOOLS} \ " 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 @@ -From fa40b874f6470ec11a8fd7b0c9909d0cdd2d6feb Mon Sep 17 00:00:00 2001 -From: Dan Callaghan <[email protected]> -Date: Fri, 5 Feb 2021 08:56:34 +1000 -Subject: [PATCH] enable LTO - -Upstream-Status: Pending ---- - Cargo.toml | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Cargo.toml b/Cargo.toml -index 7a2f6c8..cdb6b5d 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -3,3 +3,6 @@ - name = "rust-hello-world" - version = "0.0.1" - authors = ["Cody P Schafer <[email protected]>"] -+ -+[profile.release] -+lto = true --- -2.28.0 - 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 @@ -inherit cargo - -SRC_URI = "git://github.com/meta-rust/rust-hello-world.git;protocol=https;branch=master" -SRCREV="e0fa23f1a3cb1eb1407165bd2fc36d2f6e6ad728" -LIC_FILES_CHKSUM="file://COPYRIGHT;md5=e6b2207ac3740d2d01141c49208c2147" - -SRC_URI += "\ - file://0001-enable-LTO.patch \ - " - -UPSTREAM_CHECK_COMMITS = "1" - -SUMMARY = "Hello World by Cargo for Rust" -HOMEPAGE = "https://github.com/meta-rust/rust-hello-world"; -LICENSE = "MIT | Apache-2.0" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185395): https://lists.openembedded.org/g/openembedded-core/message/185395 Mute This Topic: https://lists.openembedded.org/mt/100504859/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
