From patchwork Mon Apr 2 13:09:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 894187 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="GliPelMQ"; 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 40FCHq20lQz9s2B for ; Mon, 2 Apr 2018 23:09:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9E269895A1; Mon, 2 Apr 2018 13:09:55 +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 XGYtxXkkpCJ0; Mon, 2 Apr 2018 13:09:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 10AB88953D; Mon, 2 Apr 2018 13:09:53 +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 672D51CEBE9 for ; Mon, 2 Apr 2018 13:09:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 63DA78A628 for ; Mon, 2 Apr 2018 13:09:48 +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 C1A7ebeXUER4 for ; Mon, 2 Apr 2018 13:09:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id B20398A61E for ; Mon, 2 Apr 2018 13:09:47 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id x4so26932731wmh.5 for ; Mon, 02 Apr 2018 06:09:47 -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=UCNXzCj9S/P5eWcPurkZTbQl+VEs+Za1VERoOyjpUe4=; b=GliPelMQzpeV3rquFfIzLhorQX0aj105XMBkRUS1BgcOHM2Q8fyfjdsw06BoRPWVE+ EIJc/c4I695QGniMpAb4syWOM2P1Y+mCQWpHkpRsOn9UlDAMUk8gCaTMgCCNWsSqW9la uNEpcPzInjza8wGuN2Q91eSLh0xO6suXIKGEItYRnW9G8UK4qS+iI+UjgD79tl/bKLPY KqZX/ZtTHfcsLwztROIgtGhVpb/8MjD5bW0Wvg78rmTXEBm6qb7z+Ta2jXo6/RNoYENc jWCMIBrENWQWIqKjk/Vk3BFvCsi5hBPgkgV1E/B5hUgQYnQ3dYvRz4xKLlBbRH+FrYrf MzMw== 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=UCNXzCj9S/P5eWcPurkZTbQl+VEs+Za1VERoOyjpUe4=; b=Qawoj8nwt4WTH8alsf2v9hB0QncHX7ZwepUNmhCoed2/5yt+3PISL6uQx6S7QTZOJI pLtDCphvbKqGXqLkiRbo2aVc/cpRmB32P2D5mM9RRbaT/2uH5PyQOQXj0VEPhr2sWBAj DJ+MhaoYICQgCAudUau5epRtUvxHplg7lYCvuHLs95fomyHjOFH06OnsfoGj1uN1ZOk+ FQupVbG61YizzbC5bKPgcVOT+MlPnj8JeZx78hGW0ISquGA54XgDT0QEjLuTNPxVi9KM GW0BK77gxyMVremf8XStjSaUhx1OIl1UvoC5vTpH21hIOCfVGO5IgZv6odLfSt/8Jadw aDow== X-Gm-Message-State: ALQs6tAoC32hYd/OlnCTrr7A1qLscpINul1KIXAJU222dMRCyv6hCF/2 EgNIXkoT7dvDK+5cioUij1rUDtba X-Google-Smtp-Source: AIpwx4+ySXMFvxK8+sSSZb3/6FhUNyeohUe0ZYskBhfAsEXH7G5OKmzEDHygb4RkrVLTCMm4hzC4tg== X-Received: by 10.28.126.145 with SMTP id z139mr824546wmc.18.1522674585867; Mon, 02 Apr 2018 06:09:45 -0700 (PDT) Received: from cerise.online.net ([195.154.228.195]) by smtp.gmail.com with ESMTPSA id p187sm1134507wme.8.2018.04.02.06.09.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 06:09:45 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Mon, 2 Apr 2018 15:09:33 +0200 Message-Id: <20180402130934.19274-10-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180402130934.19274-1-maxime.hadjinlian@gmail.com> References: <20180402130934.19274-1-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [v5 10/11] download: add flock call before dl-wrapper 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" In order to introduce the cache mechanisms, we need to have a lock on the $(LIBFOO_DL_DIR), otherwise it would be impossible to do parallel download (a shared DL_DIR for two buildroot instances). Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" --- package/pkg-download.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 85b75cc3e6..9e28eb6cdb 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -19,6 +19,7 @@ SSH := $(call qstrip,$(BR2_SSH)) 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) @@ -92,7 +93,7 @@ endif define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR)/ $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),BR_NO_CHECK_HASH_FOR=$(notdir $(1))) \ - $(EXTRA_ENV) $(DL_WRAPPER) \ + $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c $($(PKG)_DL_VERSION) \ -f $(notdir $(1)) \ -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \