From patchwork Sat Mar 31 14:24:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 893796 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="lR22oTB/"; 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 40D1354MsCz9rxs for ; Sun, 1 Apr 2018 01:24:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DD034309A5; Sat, 31 Mar 2018 14:24:47 +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 zhzQrmk3f32l; Sat, 31 Mar 2018 14:24:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 20F4B309A7; Sat, 31 Mar 2018 14:24:27 +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 A75541C16D3 for ; Sat, 31 Mar 2018 14:24:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A49EE8937E for ; Sat, 31 Mar 2018 14:24:18 +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 lmzB3cslYFxb for ; Sat, 31 Mar 2018 14:24:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2A2E189351 for ; Sat, 31 Mar 2018 14:24:17 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id o8so10057619wra.1 for ; Sat, 31 Mar 2018 07:24:17 -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=iLfB7MP7hSE73HMH0CWE7vw03EYawaCARmpZPEgpHFk=; b=lR22oTB/wP6HY8grTQ8E9Hf+z4cFtAspTZ6/dCxIMt0rvxD6d2fH9njl6XGUQ5SbWk AoLeFew0AVGlLeLK5cakFbrMQGvn3M1ITyWXAFDC7wo/sCO4zuFiah3gVTPDf4HY/hRQ e6R8pd41NhGE84g++I4sa1fobHom3hMs2EcRYfPW10nZJSvJp/OcxEGgF1u3wkCBfSVH /30Wbi+3q7UwXB7Myj9II3jhOc7P4+DF+iVo6ajx6cf/cRfDwEmR+FHaAH/e06v3U2i9 B8QO7yc3UVaoN2+hWQX00FF74dKe7EQBA87vgqeRKGRrzCcpH5lw9hkWXVjL0C2RXq9G zKdg== 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=iLfB7MP7hSE73HMH0CWE7vw03EYawaCARmpZPEgpHFk=; b=bd8x+J1/QGspva0y4wt43SHP8+V4pOtalOlAXJo/lKHe75cV/0YpQLsY+sng+NXAlE q2Lnma3fjU2h4rnn5Tuus8KEzLqomA5EBuuUfft/22H+SH6waIjd56dFOeiKnmkslCtO qI0A475CTLG2vkt98UBEGPNuq0axr3Zh83LtGAeX7ULRVB+WhezhS0Nzd+JjX2o2Ozn9 CtmN6VmSEBKKpvcHOmhZX6ljcWMDYZD3DfvLO1sjk7rNRNgbZ3rW8PXtvG9u1lqqajbE ti+Ep2dvsNIINXlzYcSqFQ1ugdhHbdPgiMxjqa4khRC/ShlHJ1WqyQLiPyoo8SWVL8cr GdpQ== X-Gm-Message-State: AElRT7E5y61WcE7WbuZNZEDW0/XRUi4wJUG0GXfA5NexO0OqaK+KARbh HO5yOAG1HDLWDXS74rQTmQGBJDGj X-Google-Smtp-Source: AIpwx4/lSnuENMPaomj+rRg97WouZCGOl82DyXU3637jsmV6qBQZqzcYmTNOiCs4NV1DnbO7lvlqYA== X-Received: by 10.223.164.26 with SMTP id d26mr1961250wra.199.1522506255132; Sat, 31 Mar 2018 07:24:15 -0700 (PDT) Received: from cerise.online.net ([195.154.228.195]) by smtp.gmail.com with ESMTPSA id o88sm11394409wrb.44.2018.03.31.07.24.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 07:24:14 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 16:24:01 +0200 Message-Id: <20180331142407.9522-7-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180331142407.9522-1-maxime.hadjinlian@gmail.com> References: <20180331142407.9522-1-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [v3 07/13] pkg-generic: add a subdirectory to the 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: "Yann E . Morin" , Maxime Hadjinlian 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: "Yann E. MORIN" --- 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 7587324368..b1342228c8 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -428,7 +428,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