From patchwork Wed Jan 15 13:26:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223486 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=IOZh9qrt; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm71fmPz9sRV for ; Thu, 16 Jan 2020 00:27:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AFE7E2041E; Wed, 15 Jan 2020 13:27:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BwwfiQvLY9m4; Wed, 15 Jan 2020 13:26:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 879CA20428; Wed, 15 Jan 2020 13:26:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B1B501BF983 for ; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A9C4282709 for ; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mZ2eH6zB2LkD for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 115CD8155A for ; Wed, 15 Jan 2020 13:26:39 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id f129so17860759wmf.2 for ; Wed, 15 Jan 2020 05:26:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1KkjUt44ofWEeNaE4HPbB1b+ucPLIiyJqQ1z4f2GCns=; b=IOZh9qrtGewc9IdxoT/NaUmaGCkggFu34eQR2ruhLvwz3RNvNMKHoSmCHZgCTT/JHl LZPe3vT3a0Ql+nVHfhg/dPnBbqTUKmYrPnWq4PgNsaJYDkcXPBQrVsAHpn6hkFu2LYIX SFE63zSQsIShT6XVXn0//pQoLRZPA5P7Jao5AhWKfAhPY9PUDM9rKKvGWVZOxSqZyI1n GU2Tue5CR1Z8jnY+G8Ev0J+ze4jIJIQSge6i6+wt89oSLm35DcnJeLkIHqIkOXD9s0iR j6x6T6iXGdHmObnQ4e3swB2UaGMapRQHTpVqxSgEZBNMUtxPsBUGdjQU5AfxpdxbR5/l lpUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1KkjUt44ofWEeNaE4HPbB1b+ucPLIiyJqQ1z4f2GCns=; b=hiLQVBXlATif44B9vFM17d4E6IllGdDbYwfBcAGBQfJXl1svshcckbVirfWGBzwQyL UfsBRuF8icJ1zmD5sHfovsukLXzW539nDJ4OoepLwNVzTH9z8oVGnQA8rZsUQIKdfZJ0 WjVCfiIoI4pILTMJfLDKF8fI119PwwTTN8rW+d658RNUWwE0axZqNhNsZ90JgcoFnnqR azaXsKLo1qqOq+gdvnE1HN/8ZArG5as3PkHeBZg7E40puN8vyNr2AVyC9wj1OIScgXph hYZDC8nT+mLKKAVHmAvDUSvBYFGes+0f2MGJ53YEuBVFxyxiCLG0Jd1v/Ksrd7iAiIwd 9Btg== X-Gm-Message-State: APjAAAWoY3zS3RcdEohvEmhPC4Nd7Z21xdjOJME9UUTUrR+iLSsjmKqP GDuIOp4aD8xGcuOnk+B0ZT4eMsfxzts= X-Google-Smtp-Source: APXvYqxU3B0bmWzAEnbawoTPyBC9xeAD7450k3Tfq6B2yVpO8phNfdooIy1f448gfCR0bUeU93Oipw== X-Received: by 2002:a1c:f31a:: with SMTP id q26mr32864008wmq.142.1579094797234; Wed, 15 Jan 2020 05:26:37 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:36 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:14 +0100 Message-Id: <20200115132617.26604-6-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 6/9] package/cargo: drop package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan As no package depends on the standalone cargo package, it can be dropped. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- Changes v1 -> v2: - Also update DEVELOPERS file - Also update tests/package/test_rust.py --- DEVELOPERS | 1 - package/Config.in.host | 1 - package/cargo/Config.in.host | 9 --- package/cargo/cargo.hash | 8 -- package/cargo/cargo.mk | 91 ---------------------- package/cargo/config.in | 2 - support/testing/tests/package/test_rust.py | 2 - 7 files changed, 114 deletions(-) delete mode 100644 package/cargo/Config.in.host delete mode 100644 package/cargo/cargo.hash delete mode 100644 package/cargo/cargo.mk delete mode 100644 package/cargo/config.in diff --git a/DEVELOPERS b/DEVELOPERS index 5652fc3555..aca4fd2506 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -707,7 +707,6 @@ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ F: package/cargo-bin/ -F: package/cargo/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ diff --git a/package/Config.in.host b/package/Config.in.host index 62e860d7c3..d69961e813 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -3,7 +3,6 @@ menu "Host utilities" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" source "package/btrfs-progs/Config.in.host" - source "package/cargo/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" diff --git a/package/cargo/Config.in.host b/package/cargo/Config.in.host deleted file mode 100644 index c33c6851f2..0000000000 --- a/package/cargo/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_CARGO - bool "host cargo" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_RUSTC - help - Cargo is the package manager for the Rust programming - language. - - https://crates.io/ diff --git a/package/cargo/cargo.hash b/package/cargo/cargo.hash deleted file mode 100644 index baa2cfbc33..0000000000 --- a/package/cargo/cargo.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Locally generated -sha256 1a4bae6910ca895157a1abe8225eb2b7e9b49ee1ee1e4e72fb81cb8e1446bff9 cargo-0.26.0.tar.gz -sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY -# From https://src.fedoraproject.org/repo/pkgs/cargo/cargo-0.26.0-vendor.tar.xz/sha512 -sha512 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 cargo-0.26.0-vendor.tar.xz diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk deleted file mode 100644 index a387281b4c..0000000000 --- a/package/cargo/cargo.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# cargo -# -################################################################################ - -CARGO_VERSION = 0.26.0 -CARGO_SITE = $(call github,rust-lang,cargo,$(CARGO_VERSION)) -CARGO_LICENSE = Apache-2.0 or MIT -CARGO_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - -CARGO_DEPS_SHA512 = 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 -CARGO_DEPS_SITE = https://src.fedoraproject.org/repo/pkgs/cargo/$(CARGO_DEPS_SOURCE)/sha512/$(CARGO_DEPS_SHA512) -CARGO_DEPS_SOURCE = cargo-$(CARGO_VERSION)-vendor.tar.xz - -CARGO_INSTALLER_VERSION = 4f994850808a572e2cc8d43f968893c8e942e9bf -CARGO_INSTALLER_SITE = $(call github,rust-lang,rust-installer,$(CARGO_INSTALLER_VERSION)) -CARGO_INSTALLER_SOURCE = rust-installer-$(CARGO_INSTALLER_VERSION).tar.gz - -HOST_CARGO_EXTRA_DOWNLOADS = \ - $(CARGO_DEPS_SITE)/$(CARGO_DEPS_SOURCE) \ - $(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE) - -HOST_CARGO_DEPENDENCIES = \ - $(BR2_CMAKE_HOST_DEPENDENCY) \ - host-pkgconf \ - host-openssl \ - host-libhttpparser \ - host-libssh2 \ - host-libcurl \ - host-rustc \ - host-cargo-bin - -HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo -HOST_CARGO_HOME = $(HOST_DIR)/share/cargo - -define HOST_CARGO_EXTRACT_DEPS - @mkdir -p $(@D)/vendor - $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS - -define HOST_CARGO_EXTRACT_INSTALLER - @mkdir -p $(@D)/src/rust-installer - $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER - -define HOST_CARGO_SETUP_DEPS - mkdir -p $(@D)/.cargo - ( \ - echo "[source.crates-io]"; \ - echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \ - echo "replace-with = 'vendored-sources'"; \ - echo "[source.vendored-sources]"; \ - echo "directory = '$(@D)/vendor'"; \ - ) > $(@D)/.cargo/config -endef - -HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS - -HOST_CARGO_SNAP_OPTS = \ - --release \ - $(if $(VERBOSE),--verbose) - -HOST_CARGO_ENV = \ - RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \ - CARGO_HOME=$(HOST_CARGO_HOME) - -define HOST_CARGO_BUILD_CMDS - (cd $(@D); $(HOST_MAKE_ENV) $(HOST_CARGO_ENV) $(HOST_CARGO_SNAP_BIN) \ - build $(HOST_CARGO_SNAP_OPTS)) -endef - -define HOST_CARGO_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo - $(INSTALL) -D package/cargo/config.in \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ - $(HOST_DIR)/share/cargo/config -endef - -$(eval $(host-generic-package)) diff --git a/package/cargo/config.in b/package/cargo/config.in deleted file mode 100644 index 47fad026be..0000000000 --- a/package/cargo/config.in +++ /dev/null @@ -1,2 +0,0 @@ -[target.@RUSTC_TARGET_NAME@] -linker = "@CROSS_PREFIX@gcc" diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 9854c3692e..15bb93dd97 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -73,7 +73,6 @@ class TestRustBin(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y """ @@ -102,7 +101,6 @@ class TestRust(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y """