Skip to contentSkip to conversation

cargo: use HOST_CARGO_DL_DIR instead of CARGO_DL_DIR

PATCH New Maxime Hadjinlian 2 participants 6 messages Apr 2, 2018 Arm/Zynq architecture

lore
Share & tools
lore

Maxime Hadjinlian

author
#0 lore raw

PATCH 1/5 cargo: use HOST_CARGO_DL_DIR instead of CARGO_DL_DIR

The infrastructure only provides HOST_CARGO_DL_DIR, because this package is host only. Ideally the infra should provide CARGO_DL_DIR, but it doesn't currently, and that requires more significant changes.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/cargo/cargo.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/cargo/cargo.mk +2 -2
index 36b2718e90..b3174f5b20 100644
@@ -37,7 +37,7 @@ HOST_CARGO_HOME = $(HOST_DIR)/share/cargo
 define HOST_CARGO_EXTRACT_DEPS
 	@mkdir -p $(@D)/vendor
 	$(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \
-		$(CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \
+		$(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \
 		$(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) -
 endef
 

@@ -46,7 +46,7 @@ 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)) \
-		$(CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
+		$(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
 		$(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) -
 endef
Signature · 1 line
2.16.2
author
#1 lore raw

PATCH 2/5 cryptopp: use HOST_CRYPTOPP_DL_DIR instead of CRYPTOPP_DL_DIR

The infrastructure only provides HOST_CRYPTOPP_DL_DIR, because this package is host only. Ideally the infra should provide CRYPTOPP_DL_DIR, but it doesn't currently, and that requires more significant changes.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/cryptopp/cryptopp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/cryptopp/cryptopp.mk +1 -1
index 6da39b09f2..b4997aba9d 100644
@@ -12,7 +12,7 @@ CRYPTOPP_LICENSE_FILES = License.txt
 CRYPTOPP_INSTALL_STAGING = YES
 
 define HOST_CRYPTOPP_EXTRACT_CMDS
-	$(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D)
+	$(UNZIP) $(HOST_CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D)
 endef
 
 HOST_CRYPTOPP_MAKE_OPTS = \
Signature · 1 line
2.16.2
author
#2 lore raw

PATCH 3/5 rust-bin: use HOST_RUST_BIN_DL_DIR instead of RUST_BIN_DL_DIR

In reply to Maxime Hadjinlian

The infrastructure only provides HOST_RUST_BIN_DL_DIR, because this package is host only. Ideally the infra should provide RUST_BIN_DL_DIR, but it doesn't currently, and that requires more significant changes.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/rust-bin/rust-bin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/rust-bin/rust-bin.mk +1 -1
index 759d468304..b57849093d 100644
@@ -22,7 +22,7 @@ HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAM
 define HOST_RUST_BIN_LIBSTD_EXTRACT
 	mkdir -p $(@D)/std
 	$(foreach f,$(HOST_RUST_BIN_EXTRA_DOWNLOADS), \
-		$(call suitable-extractor,$(f)) $(RUST_BIN_DL_DIR)/$(f) | \
+		$(call suitable-extractor,$(f)) $(HOST_RUST_BIN_DL_DIR)/$(f) | \
 			$(TAR) -C $(@D)/std $(TAR_OPTIONS) -
 	)
 	cd $(@D)/rustc/lib/rustlib; \
Signature · 1 line
2.16.2
author
#3 lore raw

PATCH 4/5 ti-cgt-pru: use HOST_TI_CGT_PRU_DL_DIR instead of TI_CGT_PRU_DL_DIR

In reply to Maxime Hadjinlian

The infrastructure only provides HOST_TI_CGT_PRU_DL_DIR, because this package is host only. Ideally the infra should provide TI_CGT_PRU_DL_DIR, but it doesn't currently, and that requires more significant changes.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/ti-cgt-pru/ti-cgt-pru.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ti-cgt-pru/ti-cgt-pru.mk +2 -2
index df3b97bef5..3665d2cec8 100644
@@ -13,8 +13,8 @@ TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \
 	pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx
 
 define HOST_TI_CGT_PRU_EXTRACT_CMDS
-	chmod +x $(TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE)
-	$(TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended
+	chmod +x $(HOST_TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE)
+	$(HOST_TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended
 	mv $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/* $(@D)
 	rmdir $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/
 endef
Signature · 1 line
2.16.2
author
#4 lore raw

PATCH 5/5 zynq-boot-bin: use HOST_ZYNQ_BOOT_BIN_DL_DIR instead of ZYNQ_BOOT_BIN_DL_DIR

In reply to Maxime Hadjinlian

The infrastructure only provides HOST_ZYNQ_BOOT_BIN_DL_DIR, because this package is host only. Ideally the infra should provide ZYNQ_BOOT_BIN_DL_DIR, but it doesn't currently, and that requires more significant changes.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/zynq-boot-bin/zynq-boot-bin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/zynq-boot-bin/zynq-boot-bin.mk +1 -1
index c523e04f45..c56203fb68 100644
@@ -12,7 +12,7 @@ ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+
 HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python
 
 define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS
-	cp $(ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D)
+	cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D)
 endef
 
 define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS
Signature · 1 line
2.16.2
#5 lore raw

PATCH 1/5 cargo: use HOST_CARGO_DL_DIR instead of CARGO_DL_DIR

In reply to Maxime Hadjinlian

Hello,

Quoted 8 lines · Maxime Hadjinlian

The infrastructure only provides HOST_CARGO_DL_DIR, because this package is host only. Ideally the infra should provide CARGO_DL_DIR, but it doesn't currently, and that requires more significant changes.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/cargo/cargo.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Series applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com