From patchwork Wed Oct 25 20:09:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 830361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yMh8Z04gKz9t5C for ; Thu, 26 Oct 2017 07:10:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E5E588E5D; Wed, 25 Oct 2017 20:10:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EG3oMyJYgiF7; Wed, 25 Oct 2017 20:10:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8096D88DA9; Wed, 25 Oct 2017 20:10: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 B35251C4386 for ; Wed, 25 Oct 2017 20:10:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AE4F423252 for ; Wed, 25 Oct 2017 20:10:10 +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 GMp1yk4vRHEg for ; Wed, 25 Oct 2017 20:10:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by silver.osuosl.org (Postfix) with ESMTPS id 10E20304B3 for ; Wed, 25 Oct 2017 20:10:08 +0000 (UTC) Received: from localhost.localdomain ([188.99.114.251]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MLNpK-1e7zxs1I7G-000fTV; Wed, 25 Oct 2017 22:10:06 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Wed, 25 Oct 2017 22:09:57 +0200 Message-Id: <20171025201003.16105-8-ps.report@gmx.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171025201003.16105-1-ps.report@gmx.net> References: <20171025201003.16105-1-ps.report@gmx.net> X-Provags-ID: V03:K0:vSGuVC2yUE7dET0nTmeFZZmKs13T3FXtszFYUv9TyXlHeMVL6nk 4Ydj8UWte+mS820MX1Z0n8oKlzp7f9wBus0i/oYvsHz2PO4sng7/aAkwcDaT/U0yIpTbFJD 1O/Dc8HvWYALis/+zIV2grfujppMrcO1NLtfzA+uUu94rU6Mq7cpjtrpvc63vxTZys4M2eq Agbtm4GLS6s8Pkdey1i2w== X-UI-Out-Filterresults: notjunk:1; V01:K0:RYy5ikH98HQ=:pvCsDQVtuO1vg4j07Ompfy DC4eAXdO/y1Lvf2TrrCYlXJZeYYAiXMpgyoNQnBcvu4G10eMd4q4rOKqYJrQeOxEpLwJPFvz9 y3GLG1I9oKM2TkzKYbA1dQoTO4yf8SoETMZMiuDonyRrVMV9HxFp06e5iGsQjFDMiP/UKSgyA WQPgKuWKBswWnoQdKNBZ2TRK95M5RGmIXAFQPC1YFkk/OjXSr1CCD21VOfncv0G+UPkENm97Y QBblDEwnPUkP41nn6bH++SUTk/NJJzxqrFLIVqvh/KynzeCC4LhaASkQlRa/Bl23CpOFUu6xP ZVb2t26becuKY1yf2uoZoc+8fw6n1djHS7Cv58X1LftPFdrEAUSY9WuEwsEyBnJqKC/AXh5nW rqs6Ky034nN8WFIMwhyjNd7ww6nPpZk6zk0pnT8Ku5m5sTsVM8/pfNR4Ya601QCyHLd03VmGZ FF6r5+fou1tYHoNJ8IYYfE3Ksqpre0xro9cBiAp+fLm0ND20GCXK1/C3ahygjbCumswefit3Y BAC0I1W8d3f6x6ZoB7njBZUkpdHMs0Av+F5Y1Qh4iv79MLQd+nv4Yh2DtlVZhHFDlfSs4RtT2 dPZeXtwM2rk0sIhZ7pUyzny2RINGfvdA/T3+u3OqHS5xl2joKXdF9vxqHMpX/ZFgiIGh4PTWD IU8OX/ARNHH/WdY+uKlOs1cjYMf85QAwmLkAdKLJ2dRDdE5muxptQ81mA0waa33VrOsI2ZBMX LdoOYXke3TBMCVxGVocfgVlEv91LR6fpzPs/gCF6bwwdkcYOpFIGZxQXGR7XRYKVMu7OtJWZp GVYdrBbDUXLx8eIlhys2ReNQgDZEw== Cc: Maxime Hadjinlian Subject: [Buildroot] [PATCH v2 07/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" From: Maxime Hadjinlian 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 --- Changes v1 --> v2: - from https://github.com/maximeh/buildroot/commit/a53df6631be6d9fa43d8fd7fdb2f8b2903459334.patch --- 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 676625e0a6..d07ea0f885 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -441,7 +441,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