From patchwork Mon Apr 2 18:36:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 894345 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kps7j33e"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40FLXk3Wv2z9s1P for ; Tue, 3 Apr 2018 04:36:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 612E0309EF; Mon, 2 Apr 2018 18:36:34 +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 a3SbQWIvlWQ9; Mon, 2 Apr 2018 18:36:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7694D309C8; Mon, 2 Apr 2018 18:36:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7E1211C200F for ; Mon, 2 Apr 2018 18:36:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7A6BC309C8 for ; Mon, 2 Apr 2018 18:36:31 +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 UEboNkxypatA for ; Mon, 2 Apr 2018 18:36:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by silver.osuosl.org (Postfix) with ESMTPS id 93D60309B6 for ; Mon, 2 Apr 2018 18:36:30 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id s12so4460407wrc.8 for ; Mon, 02 Apr 2018 11:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=64+8QyjU5MnerclnjVOwV8gd6AevZlCVNwU+ZU6c40U=; b=kps7j33eGpvsUZQ5K9fdipmvQI1b9W6ObThjHS3jMpEja+JVB0/dxM9PFpvcEvaTZn /jTWlOqrV/gR9DH75FVmLQo4bXhX4Ox6RblVxCrCwPpDscodtnhQ+DIqo7cIvqKBFTF7 aoK+Wk/i5A7fjJrfFYWmu1lK62k2elGkWNp+TnyBKA45POZ6Sr+DraMYFc9UCI2U7fpw cIkSLvLCzrI0kvmk6wOghfFOoBP+ojJ78Ei+ZTSsECL8dU66hRNQJ+Jn5hEqU2VTvemz ccrvD6RCa4cwhmaawbt+wUVuDCKVPcgal9PqcfAjl7b4+6DjO8m4Wn0xP+Kh1lXi6Wp5 c9Gg== 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; bh=64+8QyjU5MnerclnjVOwV8gd6AevZlCVNwU+ZU6c40U=; b=Az/1ZdPb6RC0R2W5pFxffxsXZdz6HUjCpEQOtH9nRuK0WskPtY2ZyGxFz7LX9MKuap dMdllmB1MvpemLbYU6GQFzWPs+JrZMZSUg6c2hWUCFVSiapJnok2phL0Hod7k/y4Mu5a eVCtEoyovUr6bgeM33GPkDrqbtPq7TaCUKKGT18qt4cIHV64VVvnzGWmBdzVQ9VucMeP KBvRgJOY3WdZS+Hjd9P+yydcFKDfvPJU/xxg/LRDvT50voKs6Kb+8iGcbrap4+qST7aJ XHdW4TffzyxZxVLIvTp6K3Nn1z4xSRubpFOWTps+gLoTlY94c+cRG0YdbToOlyyNIPUu J1zw== X-Gm-Message-State: AElRT7FgFZNpkTM7V/Zs0csu8J+xvMJDxMe6lKgyxyUNTRLhsnjUg/ox rq/Tut00k+/Dg+g6M5DR6RgxXmQC X-Google-Smtp-Source: AIpwx48Cz5vjOFLaAHlBog7KCYq669XaYL/hpp2DoKV95RprobJ0vQwB/dt284iJbI23KB0uT63rJw== X-Received: by 10.223.184.147 with SMTP id i19mr6919601wrf.129.1522694188506; Mon, 02 Apr 2018 11:36:28 -0700 (PDT) Received: from cerise.online.net ([195.154.228.195]) by smtp.gmail.com with ESMTPSA id h190sm2393671wmd.22.2018.04.02.11.36.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 11:36:27 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Mon, 2 Apr 2018 20:36:22 +0200 Message-Id: <20180402183626.7769-1-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [Buildroot] [PATCH 1/5] cargo: use HOST_CARGO_DL_DIR instead of CARGO_DL_DIR X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Hadjinlian MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- package/cargo/cargo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk index 36b2718e90..b3174f5b20 100644 --- a/package/cargo/cargo.mk +++ b/package/cargo/cargo.mk @@ -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