From patchwork Mon Apr 2 08:14:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 894118 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.137; helo=fraxinus.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="s1WjSESf"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40F4lF2vSVz9s28 for ; Mon, 2 Apr 2018 18:14:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CE914883AD; Mon, 2 Apr 2018 08:14:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WWnPK1kzE1QG; Mon, 2 Apr 2018 08:14:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B97B883B3; Mon, 2 Apr 2018 08:14:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7AEFC1C0B66 for ; Mon, 2 Apr 2018 08:14:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 77FB487C49 for ; Mon, 2 Apr 2018 08:14:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IpNfC2Hac8OA for ; Mon, 2 Apr 2018 08:14:43 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id E70D787C23 for ; Mon, 2 Apr 2018 08:14:42 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 80so12690500wrb.2 for ; Mon, 02 Apr 2018 01:14:42 -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:in-reply-to:references; bh=69m6NLLN08qB2SlBhkkYdmS2k5gJzhMwNGxixdvgP84=; b=s1WjSESfidL+ZcGoJllp+xbdii3gy9a6oI2eXoCBqHTZL00RLKZkEHU3Cdce7KFBEj P1knNZMvJitLONTldN98bDbjdcbDExjsj4ebd6//kDfPjRe6ukNeOeK8BmiFuQQ3YPAV 3tIUguoEIhBwOXoeZR3KQYdcpR4bZmGvS2mVtiI4Oy3zSZ8PWqAYwa6j7x9U58p2OSo8 vVEqnR1eg+BehTZrYTAC0MoCQSBqnkJUIEBnZ5lSQ1AzjhXgo8SB0n6VIkgPdpsxsSXK 9VT47ptLwN4XrnuwYE0PvE4CLVr4gYy4oMY0FRqkZGv2YIrUAquGR5Lb+zen17hdvBGT +F0Q== 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; bh=69m6NLLN08qB2SlBhkkYdmS2k5gJzhMwNGxixdvgP84=; b=HR1C5O6JD5LEbmgDrg9ib0D0l7QlrclAShahcdMNI70FtpA+14FtCo/Lm+HQ6Ew2G2 5v5fnvlygmS4NS4FoAJuPLsgI7OOz43xEa3xEvQJ2GJGHh56rnH34WWZF9GeUZts1exU 0dygrd7IYivxvj8NqWyte6sTbZ6RRG8uWsWNbjmeTCvDcP1oZycDfxPLOwE5dTsZcWSN Wudy1nL7tvi8gLBwvatgaMd6isqIIseedWYpqcqysEyz2Txweq/4mBnC8G1JhcPEVYJR 6d/QK0J6tcP0mfuSjQbIeCKU7X/4x92SXZQLaQ+Gh1sXTAbqatMLgLmag3Ot+KlwkqiH YIlw== X-Gm-Message-State: AElRT7FlMX/vP4+c3v8BLvjjTK945oiCpXz4KYQ8CHZ5otUcxK4vW9SY +EM9W4AF/3j3CwCozCG9A4/1Wb8F X-Google-Smtp-Source: AIpwx487Q2MQ2WhCZLMADW7BsTqu2mEHVwRE6UEkRDx2WeLobIpNgCj1LODjf9ob0eomPbGbPtgU7A== X-Received: by 10.223.177.213 with SMTP id r21mr6232855wra.89.1522656880959; Mon, 02 Apr 2018 01:14:40 -0700 (PDT) Received: from cerise.online.net ([195.154.228.195]) by smtp.gmail.com with ESMTPSA id a205sm51981wmf.18.2018.04.02.01.14.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 01:14:39 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Mon, 2 Apr 2018 10:14:26 +0200 Message-Id: <20180402081434.4411-5-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180402081434.4411-1-maxime.hadjinlian@gmail.com> References: <20180402081434.4411-1-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [v4 05/13] pkg-{download, generic}: use new $($(PKG)_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" Let the infrastructure use the new variable $(PKG)_DL_DIR Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" --- package/pkg-download.mk | 2 +- package/pkg-generic.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2ee745fddd..151b2e5423 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -95,7 +95,7 @@ define DOWNLOAD -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -n $($(PKG)_BASENAME_RAW) \ -N $($(PKG)_RAWNAME) \ - -o $(DL_DIR)/$(notdir $(1)) \ + -o $($(PKG)_DL_DIR)/$(notdir $(1)) \ $(if $($(PKG)_GIT_SUBMODULES),-r) \ $(DOWNLOAD_URIS) \ $(QUIET) \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 25a34e6ca2..e7f4a0402d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -613,7 +613,7 @@ $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned # default extract command $(2)_EXTRACT_CMDS ?= \ - $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$(DL_DIR)/$$($(2)_SOURCE) | \ + $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$($(2)_DL_DIR)/$$($(2)_SOURCE) | \ $$(TAR) --strip-components=$$($(2)_STRIP_COMPONENTS) \ -C $$($(2)_DIR) \ $$(foreach x,$$($(2)_EXCLUDES),--exclude='$$(x)' ) \