From patchwork Tue Jul 4 16:22:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 784172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3x28S06zCZz9t0j for ; Wed, 5 Jul 2017 02:22:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WbpWjEM8"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0EC5287AA0; Tue, 4 Jul 2017 16:22:54 +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 4XfrJma4ThkB; Tue, 4 Jul 2017 16:22:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 150EA87A19; Tue, 4 Jul 2017 16:22:45 +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 646DD1C0021 for ; Tue, 4 Jul 2017 16:22:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5F61A8770C for ; Tue, 4 Jul 2017 16:22:27 +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 mRTA6Drbe2df for ; Tue, 4 Jul 2017 16:22:26 +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 CBB4D870A1 for ; Tue, 4 Jul 2017 16:22:25 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id x23so47827078wrb.0 for ; Tue, 04 Jul 2017 09:22:25 -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=rtJM9iCtZn2D7MPG/8yIuQMWljXu2F+cElxoDwejujw=; b=WbpWjEM8G+7Bwiy9SlaHb715jvFuNoMkSj3Yd+pepZy9mRD469EENU3pGzT9iKOuMr R1CWIVCTzikbWYnHZ5KF2V9ZHYgH8p4JSUqc2KoMzaFgHO818S2yEAKdeltyvU0y43aG uAVCjkt6Sxk+r6ybsKVbztPSypX41fua39WvADhzAXpkipEzUdbWnlRU3ilEyQ/NXdvA d70U9vlr5GThv2vfkYLb5sKj/+cynw9vbYsOopXl+gcOsUzeCbAUTQ9FKxgZ2vntMLz9 zeKjNmAFX9gcEx9fxoItYZB3T8sPKz1n8dSQ4eRFOQOjcSvhbHkbuhZDAtVwN+WRQCNl pWPA== 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=rtJM9iCtZn2D7MPG/8yIuQMWljXu2F+cElxoDwejujw=; b=Pm2VfWKPF6PEfDn2zeQABf4fU2Ny5mvL0de/Dei8Y51GyzHR+1lvfunYgoRd7VIpLc CP+mAIMhOognWAm6lL6odWcpjS2eV+3WuqWBvFTa6sW/gYAtkwEz5JTKVafgFHJGCs64 WzNUirYsfLjh/+6t3VRDP0UFb+/iiyDV0TVSID9u07q9RWrUzl27I8Vwt0ZtyZT5nJ7L FxSRaxgYPWEWUO3QwR+ZDpEMRNreVK6QMcraGk0QYPVHPT7FVb6wj09+XdBv/Pfh+l8M bij23IAcOUoqppEcLVHppDceODnRyfmEc8DN4Rpj/vUtKghm3NwqwmMwaQmtgBUsE2Uz DO8w== X-Gm-Message-State: AKS2vOyyyX76r3lLoHFERzsO0uUs0N2s//yhYec53hqL+2AXxzVu2r72 cM4J3m+hIGTsRH7Klyc= X-Received: by 10.223.174.194 with SMTP id y60mr41018641wrc.19.1499185344127; Tue, 04 Jul 2017 09:22:24 -0700 (PDT) Received: from cerise.bzh.lan (2a01cb0886107300297010e522b1c364.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:2970:10e5:22b1:c364]) by smtp.gmail.com with ESMTPSA id u187sm3582012wmd.26.2017.07.04.09.22.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 09:22:23 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Tue, 4 Jul 2017 18:22:06 +0200 Message-Id: <20170704162211.13238-9-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170704162211.13238-1-maxime.hadjinlian@gmail.com> References: <20170704162211.13238-1-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 08/13] pkg-generic: add a subdirectory to the DL_DIR X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With all the previous changes, we are now ready to add a subdirectory to the DL_DIR. The structure will now be DL_DIR/PKG_NAME/{FILE1,FILE2} This is needed for multiple reasons: - Avoid patches with name like SHA1.patch laying flat in DL_DIR, which makes it hard to know to which packages they apply - Avoid possible collisions if two releases have the same name (e.g: v01.tar) - Allow the possibility to handle a git cache per package in the newly created subdirectory. Signed-off-by: Maxime Hadjinlian Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d169b20d6..7364551471 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -434,7 +434,7 @@ endif $(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) $(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) -$(2)_DL_DIR = $$(DL_DIR) +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_RAWNAME) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) ifndef $(2)_SUBDIR