Message ID | b96a4239687a19aed99c84c7b98a8d907ab313f5.1555357644.git.yann.morin.1998@free.fr |
---|---|
State | Accepted |
Headers | show
Return-Path: <buildroot-bounces@busybox.net> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c8z+oNjl"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44jfDQ3QB4z9s3q for <incoming-buildroot@patchwork.ozlabs.org>; Tue, 16 Apr 2019 05:47:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 795338682F; Mon, 15 Apr 2019 19:47:48 +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 puycr5p-TmSq; Mon, 15 Apr 2019 19:47:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A926B86651; Mon, 15 Apr 2019 19:47:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 60DE41BF37A for <buildroot@lists.busybox.net>; Mon, 15 Apr 2019 19:47:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5DD39824D4 for <buildroot@lists.busybox.net>; Mon, 15 Apr 2019 19:47:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AuK14c5LI-ta for <buildroot@lists.busybox.net>; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by hemlock.osuosl.org (Postfix) with ESMTPS id A710F81FB4 for <buildroot@buildroot.org>; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id h18so21973487wml.1 for <buildroot@buildroot.org>; Mon, 15 Apr 2019 12:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+AuGiLL0gV5Quod97sZiq1ZC+LbZ5rtQvOViF3qWlfY=; b=c8z+oNjlqm2pmp4/WMRVTfS6tM08rcN2t7AQlYVW4Vg+50GQxSQmQxFoB6YK8eITKx reBg73dT2C4vf1Km1tLI9weB6Dqi1pI77msZDGTa9IJNElsxJVfCTMtUxHzlpHbtiQZO qAiohZUyxJsuQASgWVzf9G80wfxWqjDehSP3M72Rr1vzxAvhmi13uCQgt0pOXG2kZm4C a48PEmi/pBZuIQam+WEegEfYBaBX5YhkkgE+zjTXj+zYkdc8qeXc4wSo1xkZTNosbIL0 prMPWMKNEd08FHpetzkBIttzMXaM9DXHP0lUzDqomFeY3P54dfHMHOsUTnM7AUVqzxzW Alxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+AuGiLL0gV5Quod97sZiq1ZC+LbZ5rtQvOViF3qWlfY=; b=rP1L/qMYjRkSIxii2BVOMLnV9IrhUlct5PNWD9d2O0SwbWbNV46xYNzYBQuUgo6ZD0 6yMA45wVti0ZDvjijcVryrBb83LMIjQIaun4fBjBGmpS2iCxg4L5PBKeUCkZVFWkGfv+ 5+rUPTVirmIObPUiLNlNla3PeH7kMrE2h6uscooTSVI3JEdINtb0a1DWkYhQ1qffP2PW IhtocddJ9AZYIPvJ1fL39xTDetWEo32XeosLFqCDVRjr427Q6YDcVZD+qMUTodLQgWlW WqPIAAtQCpXxdXCiSsqeH8bDmRlKSS80PLbhbni4VhAjfSYdZuLyBHvqbNilQVr3n+qK LvMw== X-Gm-Message-State: APjAAAW/8xp1Sd8sIthx6uhgMRBKGXeSQdFepglyRT1+zAF+FyG8RIzA xTq8+8Keu6XnbGUTWhuz8kOijFqz X-Google-Smtp-Source: APXvYqyyPnOW6H342P7OuFoNYiEnYu0Lm1Je6Kugr2uCA5WpDQ4IX4hnVZUpYn1BSTz+pmrNC+sJ9w== X-Received: by 2002:a1c:c101:: with SMTP id r1mr24496294wmf.123.1555357658902; Mon, 15 Apr 2019 12:47:38 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:38 -0700 (PDT) From: "Yann E. MORIN" <yann.morin.1998@free.fr> To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:25 +0200 Message-Id: <b96a4239687a19aed99c84c7b98a8d907ab313f5.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: <cover.1555357644.git.yann.morin.1998@free.fr> References: <cover.1555357644.git.yann.morin.1998@free.fr> Subject: [Buildroot] [PATCH 03/12 v3] infra/pkg-download: get rid of the FLOCK variable X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot <buildroot.busybox.net> List-Unsubscribe: <http://lists.busybox.net/mailman/options/buildroot>, <mailto:buildroot-request@busybox.net?subject=unsubscribe> List-Archive: <http://lists.busybox.net/pipermail/buildroot/> List-Post: <mailto:buildroot@busybox.net> List-Help: <mailto:buildroot-request@busybox.net?subject=help> List-Subscribe: <http://lists.busybox.net/mailman/listinfo/buildroot>, <mailto:buildroot-request@busybox.net?subject=subscribe> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>, "Yann E. MORIN" <yann.morin.1998@free.fr>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Maxime Hadjinlian <maxime.hadjinlian@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net> |
Series |
[01/12,v3] infra/pkg-download: return just a list of URIs
|
expand
|
diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 623caf9325..96a12b1f2e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -18,7 +18,6 @@ export SCP := $(call qstrip,$(BR2_SCP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) DL_WRAPPER = support/download/dl-wrapper -FLOCK = flock $($(PKG)_DL_DIR)/ # DL_DIR may have been set already from the environment ifeq ($(origin DL_DIR),undefined) @@ -99,7 +98,7 @@ endif define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) - $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ + $(Q)$(EXTRA_ENV) flock $($(PKG)_DL_DIR)/ $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -d '$($(PKG)_DL_DIR)' \ -D '$(DL_DIR)' \
The FLOCK variable is context-dependent, and expects the PKG variable to be set to the current package. This is not so nice. Besides, it is used in a single location. Get rid of this intermediate variable, and directly use flock where we need it. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- package/pkg-download.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)