[v3,07/10] package/cargo: drop package
diff mbox series

Message ID 20200207180829.165689-8-arnout@mind.be
State New
Headers show
Series
  • Merge rust and cargo
Related show

Commit Message

Arnout Vandecappelle Feb. 7, 2020, 6:08 p.m. UTC
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>

As no package depends on the standalone cargo package, it can be
dropped.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Patrick Havelange <patrick.havelange@essensium.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 DEVELOPERS                                 |  1 -
 package/Config.in.host                     |  1 -
 package/cargo/Config.in.host               |  9 ---
 package/cargo/cargo.hash                   |  8 --
 package/cargo/cargo.mk                     | 85 ----------------------
 support/testing/tests/package/test_rust.py |  2 -
 6 files changed, 106 deletions(-)
 delete mode 100644 package/cargo/Config.in.host
 delete mode 100644 package/cargo/cargo.hash
 delete mode 100644 package/cargo/cargo.mk

Comments

David PIERRET March 27, 2020, 10:56 a.m. UTC | #1
Hi,
Working on a new package using rust, this patch suite have resolved my
issue with rust version successfully.

Regards
David

On Fri, Feb 7, 2020 at 7:10 PM Arnout Vandecappelle (Essensium/Mind)
<arnout@mind.be> wrote:
>
> From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
>
> As no package depends on the standalone cargo package, it can be
> dropped.
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> Signed-off-by: Patrick Havelange <patrick.havelange@essensium.com>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: David Pierret <david.pierret@smile.fr>
Tested-by: David Pierret <david.pierret@smile.fr>
> ---
>  DEVELOPERS                                 |  1 -
>  package/Config.in.host                     |  1 -
>  package/cargo/Config.in.host               |  9 ---
>  package/cargo/cargo.hash                   |  8 --
>  package/cargo/cargo.mk                     | 85 ----------------------
>  support/testing/tests/package/test_rust.py |  2 -
>  6 files changed, 106 deletions(-)
>  delete mode 100644 package/cargo/Config.in.host
>  delete mode 100644 package/cargo/cargo.hash
>  delete mode 100644 package/cargo/cargo.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 3520072034..e0f6e7278c 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -709,7 +709,6 @@ N:  Eric Le Bihan <eric.le.bihan.dev@free.fr>
>  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 3f6646d027..0000000000
> --- a/package/cargo/cargo.mk
> +++ /dev/null
> @@ -1,85 +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
> -endef
> -
> -$(eval $(host-generic-package))
> 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
>          """
> --
> 2.24.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Patch
diff mbox series

diff --git a/DEVELOPERS b/DEVELOPERS
index 3520072034..e0f6e7278c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -709,7 +709,6 @@  N:	Eric Le Bihan <eric.le.bihan.dev@free.fr>
 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 3f6646d027..0000000000
--- a/package/cargo/cargo.mk
+++ /dev/null
@@ -1,85 +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
-endef
-
-$(eval $(host-generic-package))
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
         """