From patchwork Mon Apr 2 14:58:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 894282 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="GnH866bp"; 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 40FFhz1z1tz9s0w for ; Tue, 3 Apr 2018 00:58:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 10A2925EA4; Mon, 2 Apr 2018 14:58:23 +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 Af33U2+WBBAQ; Mon, 2 Apr 2018 14:58:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9C88F22898; Mon, 2 Apr 2018 14:58:17 +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 79C2D1C2314 for ; Mon, 2 Apr 2018 14:58:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7004D89008 for ; Mon, 2 Apr 2018 14:58:13 +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 Yq3ow67-BdzR for ; Mon, 2 Apr 2018 14:58:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4240588EDE for ; Mon, 2 Apr 2018 14:58:12 +0000 (UTC) Received: by mail-wr0-f182.google.com with SMTP id d1so14146866wrj.13 for ; Mon, 02 Apr 2018 07:58:12 -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=e9eAyqv7MmXiSc2V7hRCaD1/QMYtjZwCxvwu76ShRhQ=; b=GnH866bpT9lhYOMEjQbCK1IcUOpLn6vh3c6j0F+fyGa88b5ZOww1p1smlHk1UuHTHS d1q291UAQnzf0wrrUKC3djkPzVWAvAsv+GDusYyzGHtE2CpPN6EdRyrLrVfK/mgEH/XW J4IgSqBT3OBwxCplsB5bIPTjMnzmTskRf3eMKv3f+SMVurnetuzX+1Dsi/1pGbOesuPP 0Rmvqcp9+5fiIkC1+iDFGoAWFu7+wPurD79K24smo/ye1jaAEurXdWH24XzkA/no0DQ+ XwGyewfg33f6p5GDv8W238Ik5HB4vVslJ7aUpc3q9q0S4w28m6wQXG/Eb2OGbD3EvrT3 D61A== 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=e9eAyqv7MmXiSc2V7hRCaD1/QMYtjZwCxvwu76ShRhQ=; b=nx65443Xs1bMhKQ0f7XKyrYSHCnMt6R2WSafFNJpExU4AWC5YZ4lNN0syAsZcBaiqJ 9qaZhYaHbF+UPa3OdZ/Y0jM2ayJVUTt9nPMlqPC4LbQZzWDRXdRRTF9dYSY9kmQ/dKqu aiBExOHZ837qvzipXQylS7PczzchhNq2IKaGqa1XTh6lNqDpKie6fY6/AuBAsmYE/IXs K1FSU0KKE1X1qs3mCAI4POeoveIl84nhS+Nn0UbyIPudJlNHh0t4plMKZ1Ajq30gCBdc znYNYU7Z/6qZEOx3zbzZ2JzyzNhrMWmAzZuZwMzkkznoOiIVenblfupgabiMcrv2G6bh 7B8Q== X-Gm-Message-State: AElRT7EWCYFC2e2Dm/VgLz0gu10oUZihKAQ5bu7CiShV9HR0gTeHaVZE sG4CJLwh81sgOF84F3NzW1+rYKaJ X-Google-Smtp-Source: AIpwx4/mgErcyXr7xyc9lPBmtkO/S2E7/vnPf8htQZn/UImODk2vaf8H2ozbGik+npITvIvN6xKy1A== X-Received: by 10.223.190.138 with SMTP id i10mr7230468wrh.40.1522681090423; Mon, 02 Apr 2018 07:58:10 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 07:58:09 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Mon, 2 Apr 2018 16:58:00 +0200 Message-Id: <20180402145802.17611-6-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180402145802.17611-1-maxime.hadjinlian@gmail.com> References: <20180402145802.17611-1-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 6/8] 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 7ca6fcc757..4fdb283acc 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) @@ -93,7 +94,7 @@ define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)), BR_NO_CHECK_HASH_FOR=$(notdir $(call qstrip,$(1)))) \ - $(EXTRA_ENV) $(DL_WRAPPER) \ + $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -f '$(notdir $(1))' \ -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \