From 342fd3e7350479dc368541ac77a5130ebb53194c Mon Sep 17 00:00:00 2001 From: Patrick Havelange Date: Sat, 19 Dec 2020 16:35:22 +0100 Subject: [PATCH] package/ripgrep: convert to cargo infrastructure This commit converts the ripgrep package to the cargo infrastructure. This causes the vendoring mechanism to kick in, which changes the contents of the tarball. To avoid a clash on the hash, we change the version of ripgrep to the Git commit hash matching the 13.0.0 tag, so there are no functional changes, but the tarball name is different. Signed-off-by: Patrick Havelange Signed-off-by: Thomas Petazzoni --- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 ++++++------------------------------ 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index b2f03a95e6..cd2dbedfb4 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2 ripgrep-13.0.0.tar.gz +sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 7c2b79a4a7..d587441cfa 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,7 +4,11 @@ # ################################################################################ -RIPGREP_VERSION = 13.0.0 +# Same as 13.0.0, we use a Git commit hash because the hash of this +# tarball changed when moving to the cargo-package infrastructure, and +# we can't change the hash of existing tarball. Please switch back to +# a Git tag at the next version bump. +RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT @@ -13,33 +17,4 @@ RIPGREP_CPE_ID_VENDOR = ripgrep_project # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 -RIPGREP_DEPENDENCIES = host-rustc -RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ - __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ - CARGO_TARGET_APPLIES_TO_HOST="false" - -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) - -RIPGREP_CARGO_OPTS = \ - -Z target-applies-to-host \ - --target=$(RUSTC_TARGET_NAME) \ - --manifest-path=$(@D)/Cargo.toml - -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -RIPGREP_CARGO_BIN_SUBDIR = debug -else -RIPGREP_CARGO_OPTS += --release -RIPGREP_CARGO_BIN_SUBDIR = release -endif - -define RIPGREP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ - cargo build $(RIPGREP_CARGO_OPTS) -endef - -define RIPGREP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \ - $(TARGET_DIR)/usr/bin/rg -endef - -$(eval $(generic-package)) +$(eval $(cargo-package))