From patchwork Wed Aug 2 13:16:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RnLDqWTDqXJpYyBNYXJ0aW5zb25z?= X-Patchwork-Id: 28306 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 DB175C41513 for ; Wed, 2 Aug 2023 13:16:38 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web10.14851.1690982190834944540 for ; Wed, 02 Aug 2023 06:16:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=mRjJoIqj; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: frederic.martinsons@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-314417861b9so5809830f8f.0 for ; Wed, 02 Aug 2023 06:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690982189; x=1691586989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8pZ2WX68aDWAS3Kz6YW/Ssi3m9JbUNikX7H6OcXIGKA=; b=mRjJoIqjM8Mpz2ytfRvPRDxoTU7IgNZKpj7ZXAI8SoLtYjQbKNuGxHHsjIYICsLv8z zzJ7C59MsTndocSZt18NHRw0J7fIKZcxsQsooSAXbli3aQoPnCx0SbM25834HgQVVcPS GJ4rsrcpmpSwPOTcGFL9pgixPpG5Gg10f2tA+96c/Y4M2gNocxRjW/Zh387uzHT/8p7j /PFZKHZvwI3PssOE4upSGXVVU3Masjef+oq852BJxSIPQwf0JWa5enqtYz1j0kveVlUw WsGP6+nmmP6gkNopGw2T8LGfVQGjoQ7RTl2AmSmxY9jJChILG+sxNjTaaLC38FNjznEK OEIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690982189; x=1691586989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8pZ2WX68aDWAS3Kz6YW/Ssi3m9JbUNikX7H6OcXIGKA=; b=MKCLPPZBzSnJnR3fU+X09r4A+uq0Kb27ls/QR4/lh/WQ3DmtAbcsoTirpS94yYPgea 4NQd77yrRnW3VNDDUx5BPRJEuVtqiFKdWlHurSFEITiYbDctcrxIGUfSgP9zTABblCdk jtzfNemXJEGci3WqPwXdxCnrTNubmrPbd6DLsa6Xk13P7r2uBZzr23cQIz9bvtxcNhzZ RwMxRL0IphR3eDGksKGZeOb0WF2sVEnM8bpyS8igi7SVavYXP5SJoeQr7PMn1eqeCUUm i2m1gYnW3ykzvX0jX71MWG3zynIpxUhlg/MDfpxZGJGwVCK1oQfDOpxnlOzR5w1tvsBD emcw== X-Gm-Message-State: ABy/qLYk2sZG8nF5BAkWsKSY7IjWyEJOTddBX3FwUXZ30nMJSjdEiKJ7 0GgjlMcZuTlkeIPmtfAL96tdn9tAIuA= X-Google-Smtp-Source: APBJJlHdQFSlLy9xPX2e7h44Bap+Uq7XC+bMdKjUM9Dff5E94WDswnyXKsir4t98LB9sy0gRZ6Qnaw== X-Received: by 2002:adf:db44:0:b0:317:9537:d73e with SMTP id f4-20020adfdb44000000b003179537d73emr4780822wrj.35.1690982188758; Wed, 02 Aug 2023 06:16:28 -0700 (PDT) Received: from work-pc.core.sigfox.net ([2a01:e0a:8d5:c6c0:ab32:1451:bfe8:2a0f]) by smtp.gmail.com with ESMTPSA id l18-20020adfe9d2000000b003112f836d4esm18951248wrn.85.2023.08.02.06.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 06:16:28 -0700 (PDT) From: frederic.martinsons@gmail.com To: openembedded-core@lists.openembedded.org Cc: Frederic Martinsons Subject: [PATCH 1/3] cargo.bbclass: Use --frozen flag for cargo operations Date: Wed, 2 Aug 2023 15:16:03 +0200 Message-Id: <4e731c16b45846bd530953fbdb47026df2e32c59.1690981978.git.frederic.martinsons@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Wed, 02 Aug 2023 13:16:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185393 From: Frederic Martinsons It supersed the --offline flag and guarantee that Cargo.lock file will not be modified during the build. Signed-off-by: Frederic Martinsons --- meta/classes-recipe/cargo.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/cargo.bbclass b/meta/classes-recipe/cargo.bbclass index 3ef0bbbb44..8c0b92df8d 100644 --- a/meta/classes-recipe/cargo.bbclass +++ b/meta/classes-recipe/cargo.bbclass @@ -39,7 +39,12 @@ MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml" RUSTFLAGS ??= "" BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}" -CARGO_BUILD_FLAGS = "-v --offline --target ${RUST_HOST_SYS} ${BUILD_MODE} --manifest-path=${MANIFEST_PATH}" +# --frozen flag will prevent network access (which is required since only +# the do_fetch step is authorized to access network) +# and will require an up to date Cargo.lock file. +# This force the package being built to already ship a Cargo.lock, in the end +# this is what we want, at least, for reproducibility of the build. +CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} --manifest-path=${MANIFEST_PATH}" # This is based on the content of CARGO_BUILD_FLAGS and generally will need to # change if CARGO_BUILD_FLAGS changes. From patchwork Wed Aug 2 13:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RnLDqWTDqXJpYyBNYXJ0aW5zb25z?= X-Patchwork-Id: 28304 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 CC42EC001DF for ; Wed, 2 Aug 2023 13:16:38 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.14665.1690982191964157932 for ; Wed, 02 Aug 2023 06:16:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Wu9bFInC; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: frederic.martinsons@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31427ddd3fbso6282712f8f.0 for ; Wed, 02 Aug 2023 06:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690982190; x=1691586990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4NF0pv8k7hGO9nLYwlw08qIcEqwY8gl97EEPJ49imMU=; b=Wu9bFInC2Z3PRX+E7xz+ensqj7PEBNjXtxlfhvj/cxpy+BDiELfIxD9dTbWXI6wAhs mj88Zfk153oTW/x7J6IzAq9tg42W8v3eYwp4dO/YN8KollOV/v3stcyc2nMZnJvHl1Iu ZIyGrFhVJg9/uNIL3s4dulLCUydN5qsm7zRB6SgYud5dUrjMZXow1ZKKvDx/h1PwTScl +4sU4JxZeZ772ogT2W7EqYmeM3AzGETVnZ/MIX5szKYdMP+oOZpu5mOKGw0HJyFQjwZ8 nVvVCwcjgRDn+K8hjhgi5ohBDcJ5FGCcoeW1ewe09YctxXdVLlboS3DnyETbMZ/8FqfG 77Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690982190; x=1691586990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4NF0pv8k7hGO9nLYwlw08qIcEqwY8gl97EEPJ49imMU=; b=epvdKRvHDIwE0vGBU5koOk5jVC0zk3wJXKhZX+X5PmKfeGokBqA/EocCO2JoFkdoRj ojT0cLzafIS61g0Ok29jUylijVp1M2dLJmPMDlg9c/oCRwHu2KOf5xWGLIUusCDxWNNm 2ZcQctnvtcdcXr6gZO5/Wfc5J59npPTbETitdvQX5/eCoz9rZuK2+uSL3YIy0iZIZ3Uh JjEYgcknFTWa8l1KJNziPFEoffxIW1xuOuxTHx7X6eQK3GaskZ78YwNRAEtv8FxyjPGg tNyCc7g6HssatNhy9xYTzQm3lqE7h+1E9HyqyfTfXkohwd/UeVX7uyMxVIuzuw6yyTnv Fcpw== X-Gm-Message-State: ABy/qLYenlkDx+mERfRoFKbIGV1dh6/zpR8mu8V12qOtkLCJGLeYmLpP GXpycT0sAf8NBU07JjRHKocO0/flX24= X-Google-Smtp-Source: APBJJlFAN/Glt9oaJmbMmcG4ZwnlPmLXiVrlNJFCQOfhMwPMn3i1dmW83bM6Mp9X2TgNrlgnB5Eufw== X-Received: by 2002:a05:6000:108b:b0:314:1560:cc68 with SMTP id y11-20020a056000108b00b003141560cc68mr4548571wrw.56.1690982189897; Wed, 02 Aug 2023 06:16:29 -0700 (PDT) Received: from work-pc.core.sigfox.net ([2a01:e0a:8d5:c6c0:ab32:1451:bfe8:2a0f]) by smtp.gmail.com with ESMTPSA id l18-20020adfe9d2000000b003112f836d4esm18951248wrn.85.2023.08.02.06.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 06:16:29 -0700 (PDT) From: frederic.martinsons@gmail.com To: openembedded-core@lists.openembedded.org Cc: Frederic Martinsons Subject: [PATCH 2/3] cargo_common.bbclass: Handle Cargo.lock modifications for git dependencies Date: Wed, 2 Aug 2023 15:16:04 +0200 Message-Id: <51dae2aea3c591d6f96aa91af4b467332433b28e.1690981978.git.frederic.martinsons@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Wed, 02 Aug 2023 13:16:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185394 From: Frederic Martinsons Now we use --frozen, Cargo.lock cannot be modified by cargo build. These patched git dependencies requires that the git url is removed from Cargo.lock. Fixes #15104 Signed-off-by: Frederic Martinsons --- meta/classes-recipe/cargo_common.bbclass | 41 ++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass index db54826ddb..b732a1bd95 100644 --- a/meta/classes-recipe/cargo_common.bbclass +++ b/meta/classes-recipe/cargo_common.bbclass @@ -117,6 +117,8 @@ cargo_common_do_configure () { } python cargo_common_do_patch_paths() { + import shutil + cargo_config = os.path.join(d.getVar("CARGO_HOME"), "config") if not os.path.exists(cargo_config): return @@ -146,6 +148,45 @@ python cargo_common_do_patch_paths() { print('\n[patch."%s"]' % k, file=config) for name in v: print(name, file=config) + + if not patches: + return + + # Cargo.lock file is needed for to be sure that artifacts + # downloaded by the fetch steps are those expected by the + # project and that the possible patches are correctly applied. + # Moreover since we do not want any modification + # of this file (for reproducibility purpose), we prevent it by + # using --frozen flag (in CARGO_BUILD_FLAGS) and raise a clear error + # here is better than letting cargo tell (in case the file is missing) + # "Cargo.lock should be modified but --frozen was given" + + manifest_path = d.getVar("MANIFEST_PATH", True) + lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock") + if not os.path.exists(lockfile): + bb.fatal(f"{lockfile} file doesn't exist") + + # There are patched files and so Cargo.lock should be modified but we use + # --frozen so let's handle that modifications here. + # + # Note that a "better" (more elegant ?) would have been to use cargo update for + # patched packages: + # cargo update --offline -p package_1 -p package_2 + # But this is not possible since it requires that cargo local git db + # to be populated and this is not the case as we fetch git repo ourself. + + lockfile_orig = lockfile + ".orig" + if not os.path.exists(lockfile_orig): + shutil.copy(lockfile, lockfile_orig) + + newlines = [] + with open(lockfile_orig, "r") as f: + for line in f.readlines(): + if not line.startswith("source = \"git"): + newlines.append(line) + + with open(lockfile, "w") as f: + f.writelines(newlines) } do_configure[postfuncs] += "cargo_common_do_patch_paths" From patchwork Wed Aug 2 13:16:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RnLDqWTDqXJpYyBNYXJ0aW5zb25z?= X-Patchwork-Id: 28307 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 DA161C00528 for ; Wed, 2 Aug 2023 13:16:38 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.14853.1690982193063103694 for ; Wed, 02 Aug 2023 06:16:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=JnohUpc6; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: frederic.martinsons@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3fb4146e8deso74062935e9.0 for ; Wed, 02 Aug 2023 06:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690982191; x=1691586991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EkCP8Fd0Jz79gki+ChLtlejuzRUMD3wKqWF2ou/EaMk=; b=JnohUpc6VG5C6BbGRqQ8boOjdmUHW+wDWCuuAE4O1sfQmbBvjl7blll2kGjn7JQEKN CGUc6XCfa7APkLIzKVm6KwW4N0UyAyy0TUGkFF7I+v4Ta23gINBLqCGr/0DzWYYdNVlk vg2vG0AgLn1NwFAVp/sggtj6KeU5JlBmyxdpIz6AOTY6ItvAC/za8v4yw7lS1dsUZ6G+ t6ykD7E2hSVkR69VczxOcb/fmHlsgaRrZ/n1uad59PDo42wdUaYt2Gjr74G7ua6VFNv2 970otnCvjxamvL6vesl3RIjWnrWED+MfZk+x4vb/1EcFBXzapE35rb/p3uCa5Zs0FWxZ cv/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690982191; x=1691586991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EkCP8Fd0Jz79gki+ChLtlejuzRUMD3wKqWF2ou/EaMk=; b=L9ReV04PEZrTx88tP4PFp5uLaJid5v/kgBYblCbODZPHWIt97jVqkifkRpzRObuPe1 Lx8zC2nfD9Ujw0QHLaBYBLkWBDBVeZbA0LfXHUwwi9mW333kKiqfFz5hLjvnf2a0z2JT 13HW8z9qTheqNWNbaJnAJfy6LaP+LOVpbAIFBurUxwAc6Prd3c4aJxOw9Ldbr3pM4dSf HpM+L3AWXImAXSxMz84urQhW7sEVaR24XVvHNbxzLBJK2DbzlCuoPWZ6XfY3+i8e329X hSoM08Su1LAZdbX0dKsBmbHtiF3NXNq3D/H6JGaHqP0I2mmY5XxZ7VX1Rb8zISD68iy+ hNkA== X-Gm-Message-State: ABy/qLbCBbLNjGnrLw285UmSOCa1wqQeYecxQXo1W83iD69GDkG9Yoth XNGkPohPpLLfeomr30YaDWUv8g7/sUw= X-Google-Smtp-Source: APBJJlHQIVaXVuep/IjuCG6ouwoEDpyRWn5jpl43fGkZfNyAqu+eG0BcSGRWewAPpQKzrEJ/6xISjg== X-Received: by 2002:a5d:43c3:0:b0:317:734e:3614 with SMTP id v3-20020a5d43c3000000b00317734e3614mr5005221wrr.39.1690982190991; Wed, 02 Aug 2023 06:16:30 -0700 (PDT) Received: from work-pc.core.sigfox.net ([2a01:e0a:8d5:c6c0:ab32:1451:bfe8:2a0f]) by smtp.gmail.com with ESMTPSA id l18-20020adfe9d2000000b003112f836d4esm18951248wrn.85.2023.08.02.06.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 06:16:30 -0700 (PDT) From: frederic.martinsons@gmail.com To: openembedded-core@lists.openembedded.org Cc: Frederic Martinsons Subject: [PATCH 3/3] drop rust-hello-world recipe Date: Wed, 2 Aug 2023 15:16:05 +0200 Message-Id: <69932b78a14903b214fcb19c780d88dccefe4a18.1690981978.git.frederic.martinsons@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Wed, 02 Aug 2023 13:16:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185395 From: Frederic Martinsons we now have more rust/cargo recipes and test that covers various use cases. Signed-off-by: Frederic Martinsons --- 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 " RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton " RECIPE_MAINTAINER:pn-rust = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod " -RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod " RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned " RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton " 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 -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 "] -+ -+[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"