From patchwork Mon Apr 2 14:57:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 894275 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.138; helo=whitealder.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="l/KtHX5k"; dkim-atps=neutral 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 40FFhh1W8lz9s28 for ; Tue, 3 Apr 2018 00:58:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 728AD88E15; Mon, 2 Apr 2018 14:58:10 +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 cmpHm-30OrdG; Mon, 2 Apr 2018 14:58:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A22A88EC3; Mon, 2 Apr 2018 14:58:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 835F61C2314 for ; Mon, 2 Apr 2018 14:58:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8037F88E4C for ; Mon, 2 Apr 2018 14:58:08 +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 LPcjdXgmNDBy for ; Mon, 2 Apr 2018 14:58:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id B05F088E15 for ; Mon, 2 Apr 2018 14:58:07 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id s18so14144623wrg.9 for ; Mon, 02 Apr 2018 07:58:07 -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=E9Xhvp2bh0kk/wB7PMLKD99rK54Tanip0kadiUrgI0A=; b=l/KtHX5kS99bc7bCjruuqMnMZkYtFgs2IzQ6XB58mztgP8pOPmiUe9xuqdx/Ij2wTM CtV2Y0eHIVFqCgOS6iYTmqCsYhvRyEGj8Qlu/59Ju7IODNWLh8W142eJa01FUENeRz42 ivvehGZQbTuNA4bmWbTjffmrvBrqNeQtdwl/4LKZNe+wvUsqBZKEAJx9TXmMAsetiWuw 4W8n7SJqynz7LAhioHIY9Qpr+YAeeXHXSp0FXK7l5MaRI6kTo3A17gM825xInIBeHJEl cHfzZhT3tBdVEv+2NmCXkqmjVSD+P30+Ebkn4fmdKac4q5EZm8Who44lz8tgaPtiY8r6 g3yg== 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=E9Xhvp2bh0kk/wB7PMLKD99rK54Tanip0kadiUrgI0A=; b=RA+eMrP+FtKbOi8pTgS1Aeh1ZNFThNOW2DNIKdz1L3Rz+5fpiJG+Wi+KoVKFXV3/ol nlbaYjr/mtlbwSoAVisY575miLZCvrSOBPC6Fa9EJkBS/U/Dh+pWZER4SlN0PZJ8bSiw N2UOqgR23ghbWGm7g+Un6tIml9Kh84LonlJczt/K8VJWmDsSjDeKnjiS42aeUR7A0SsR MrkvktwTUi2pNNDr+ovY3XxTRa1bi+ok83ydVVrJUk60E4Js/jT7o3zUsUhmGcU0rzMs KyqIQl06Gp1k2udI/k2pLNEtcYG+ZSEYWf89vfbjbJMFHQytDzJhxAGN8HMo01BXZvrQ 0Big== X-Gm-Message-State: AElRT7Fed6wy6jp7Ht5y9mHWr2BaKHPXi+GqvMLBcQZ44TO6POMLg75i 6vNMVRYOJppzGEW3vboFxpwz0vfK X-Google-Smtp-Source: AIpwx48PbNAmD800zWJz5LU4QfMlSiByTO3CJ2o9sCs43uezAW5DXz2cX+MFWtoBxRHJDy0BMFh0pw== X-Received: by 10.223.144.227 with SMTP id i90mr6865205wri.100.1522681085657; Mon, 02 Apr 2018 07:58:05 -0700 (PDT) Received: from cerise.online.net ([195.154.228.195]) by smtp.gmail.com with ESMTPSA id s15sm756001wrg.28.2018.04.02.07.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 07:58:04 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Mon, 2 Apr 2018 16:57:55 +0200 Message-Id: <20180402145802.17611-1-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [Buildroot] [PATCH 1/8] 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: 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 01d61ac0ad..20ee73d438 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -432,7 +432,7 @@ endif $(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) $(2)_BASENAME_RAW = $$(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)_BASENAME) ifndef $(2)_SUBDIR