From patchwork Tue Jul 25 10:17:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 108633 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp391390qge; Tue, 25 Jul 2017 03:17:34 -0700 (PDT) X-Received: by 10.98.102.129 with SMTP id s1mr19020926pfj.239.1500977854053; Tue, 25 Jul 2017 03:17:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500977854; cv=none; d=google.com; s=arc-20160816; b=KWiw9QEhER0KKJm0kAYe+Uk7PCxOJxLBuVDcMpWzKyKiamslgjlKjZZJVbJsvi7+jf 9WSN7lKH2vFXZjwcmFbscYdFE/5Ojn4copi8LL95scn/qFm9nZckga7dXNpGFBaj0PZl mb4PkfdwJjOqw717f+/KB5hfEQmBjTTM4HO6wYBpJaSCsBaVRQEbuH3cdrAFghD0qyfk 9lT0O1DBYsERDxE08l2jrThQJGY9zjAsmr/MOveTSt740g8ECcguNvaZfDM7wowiLsPw 1oBGOh1JpJ1tE5p2PR027t72rDQ18l9VowqCbdM8N3etO9ybFK8TJcnUnjx1cZpSM4Ct ZLIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=KgQenqwLGqPAgdgZVYl+ZakSg0XbH7fgkXNlRhMsMqQ=; b=QHMxDLxeJ36pnNTHGD0eOIEpbQL+uWYeRqJqbCJlpIXnnXxpI1jtcJVFpn33Xc4mcL jBJecDXjMVcxiV0UK9jhf+ARpXXvZtIaiRVa0h6kOyvhcelOuZ/lF8ZaeiV/uzjGYU/T n2KO3uczJ2MKwLQXfX6S5DiIymEj0Ntc65pqaeaxJlALJOb7KNJrLQbB9OJOWDjmZKxJ awOdUl3iY/JLY6lvk7iZmw6DBpeey0BZDrN2BeQckFN+MxuLRFx9i3z6om9BZWQ8lhTM bGdTefMv9HFsT44aLfAPaEhuR96/XQwsdu7wSRoNT/qfGXt+dSyHeZsGqHf4bEzXGoXJ 0zzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=PYDaLeGZ; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l1si8511874plb.810.2017.07.25.03.17.33; Tue, 25 Jul 2017 03:17:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=PYDaLeGZ; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 928787830E; Tue, 25 Jul 2017 10:17:29 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by mail.openembedded.org (Postfix) with ESMTP id 96D127197B for ; Tue, 25 Jul 2017 10:17:27 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id 33so60387922wrz.4 for ; Tue, 25 Jul 2017 03:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=Rf2In7KeQBuAYxFC1X8cs45L70a/GfsqbSZkgfBICcc=; b=PYDaLeGZQ1y/Cvr41fyZEXLV0ZOWO1mP2kWL1DqW0ffhaBUR7X+q3UkimvAQvahnW6 WXQUnkrhD+god5O09RknDzdkCqp3ynqSNmr4mg087cXvqgNra30fTuuQ7PH3NbuTTSbG YrqYsMXukxL/OYbMFv7ldJsNjP2Ha9+scxvk8f4jQWtHt3qSSWMSNKc1ZlPemMW22cY/ aDMeWqDxLRAZSI22+OSy8dkHdmL33ILuaRUSbJQgoLhKsTlmTyDtFUGFvaee2Tpv5wSk 5/bOPHBvRedQjI5kwcPo+wOZ0Vm0Is/zRunTAtFFHDHgdT1NxPoZtWx3UzKDOz5jMwIH KlWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Rf2In7KeQBuAYxFC1X8cs45L70a/GfsqbSZkgfBICcc=; b=pfI/E7kAtDJXgyXKLrDhKTkRLfIkW42y6zJKe1Su9wZgG2USGF0D9DqeBVxcJhl7ME L3cZzR33s8z1gLQ8pGmHsQZN+pDv/dS7iG+gav11zHX8onl9ynKNf8Cufpm8j0M7dKhr CwXfir5M/mw9zBikSKEIFrX8eN02icutSmHQlDDrS6K6BLsUaVMutZKCq+i5YBBxL1xN vY6O0a1XieIGwnVcDJNnAJKM4hc6oSWABtwIRvIpYQv+72fnbCc5Xd33Xnk72RNSlkrP Prq7T3kmUtRLqzPJ7tjYWRJQUx94Egx/ZqhP9exnMi3C9lYPhTLaMiF5akc5lCgXKTcs XYLA== X-Gm-Message-State: AIVw1135pgGUquHEpY3lCNE0vpk9uRJJfT10gEgaz6bd30K+ec7G2Xeo V9FWHDXJy5KWQUzglkk= X-Received: by 10.223.150.200 with SMTP id u66mr17329171wrb.216.1500977848009; Tue, 25 Jul 2017 03:17:28 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r199sm10645623wmd.11.2017.07.25.03.17.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 03:17:26 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Jul 2017 11:17:17 +0100 Message-Id: <20170725101719.2172-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/3] elfutils: use HTTP instead of FTP to fetch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org FTP is inferiour to HTTP is all respects, so use the HTTP URL for the tarball. Signed-off-by: Ross Burton --- meta/recipes-devtools/elfutils/elfutils_0.168.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb index c0a4f234020..0717616ec0a 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb @@ -5,7 +5,7 @@ LICENSE = "(GPLv3 & Elfutils-Exception)" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libtool bzip2 zlib virtual/libintl" DEPENDS_append_libc-musl = " argp-standalone fts " -SRC_URI = "ftp://sourceware.org/pub/elfutils/${PV}/${BP}.tar.bz2" +SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2" SRC_URI[md5sum] = "52adfa40758d0d39e5d5c57689bf38d6" SRC_URI[sha256sum] = "b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276" From patchwork Tue Jul 25 10:17:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 108634 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp391617qge; Tue, 25 Jul 2017 03:17:49 -0700 (PDT) X-Received: by 10.84.232.136 with SMTP id i8mr15835918plk.435.1500977869619; Tue, 25 Jul 2017 03:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500977869; cv=none; d=google.com; s=arc-20160816; b=bMvwbj8vMHn6+M2r1ch/3pvek4SBNnAuBN+ieYEYdbt1+Kx0Cu5Hcf4NjMW4JyUpG9 6vd6XIA616ZefOmy/89iGmYyau6soG6jPOs/x+KbrDuABd3wOiL5Mh4qjfwCoGJnofcV y6V/fGpKoZFWX3QMXOpwp6ekaG2PqOrdRJDTSi9M+iP9ISHxtH/U4VaTJzY129bad38T Gc/pUFJWLZxzHI8C0oyuJESwm0Nqr8MQIF0q1n8EnCUm+Wdd4Osm+9AirSK5Tf0dLKz2 6m1o2WsOPsGVI9R51XXkLe/ocFRoiN+tPLrqKy9uY4sjfoxUyVO/wf870uSrZ1Pg4lxd WQtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=W7XTohwFVidAnyvcSSkN2Y+7h3W/IlfYlJ+Q/Zz0p8g=; b=u+2G+0p6WLe9a42PYC307tkVzxiweisvJVn1CcRRpDXV3db8ahXuWPwXQhZYH0J9in 81s/3v9ahaQrPpP+TiODJ5FRVl2cIY8A6lSbydBaMS395B12bUZeroFKYnG83WaNwDSk eyHJmekoa146sSItKNBWU+vDR+RuGHhNyQshibyg6cVenVfCmIfFGP6T83xEZBBImj++ DWcBe5Fotsjb9n5LHldkwv4Gq/WeSFy89siVZBTdJRpW1f39MZTffeC/h2MadBbjhJkt 7hJriMb/qhFahdliIVlGRwAZGUn7AS0p5zWpqgW44ec/zs2DT4nou6EJ0YRSf2wO4iOP XYxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=aiPbphKd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y3si8127744pgq.448.2017.07.25.03.17.49; Tue, 25 Jul 2017 03:17:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=aiPbphKd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 000D378317; Tue, 25 Jul 2017 10:17:46 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by mail.openembedded.org (Postfix) with ESMTP id C516E7197B for ; Tue, 25 Jul 2017 10:17:28 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id l81so25777824wmg.1 for ; Tue, 25 Jul 2017 03:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZMCm+fpCTrP1OBJN9EDIxz8iveIjbNA26q2Z/mXH70I=; b=aiPbphKdY9icCWukOTol4sGNzmiPqlnt1uzhzQ2zDpIFfD7HTecATaQFsb2GgBjepR Snlz+YnAHHtGdB2Pn0s6gSYVo2b7jaxBTR+XE+m8K8A2c5y5GikF3yY91cwB+GdBe9PC vwHNzijlvXo8iTn1WuQYa9DQ9jdo/41tr8qEdX39He1i3BfaNmDBmjV7HoJ8fyz3cPSX 5S63+hR2cUiyO2q7nmSyAKGWyzkgNDUldCZTtde47UchIBKg0PODzzxF2F3MgiUU+pBx TjCLU6QqWx4nIwhh7IhDYuLDwEPQ/7Uv/DDJ8hqI1MEKEirZvtZVneuuVTYK427vdhqX q4qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZMCm+fpCTrP1OBJN9EDIxz8iveIjbNA26q2Z/mXH70I=; b=IQTZaav8KN/qrh7b+dag5tVt6pqZfjH0Y77pZAmR5ujyPSeIQWnYjZ1t6mJFcdlx6h 2jAzVsBwooF/qS1kTW8fh73bGPPhbE799f/2gSJdEWosZR+OUzP8XFKE/xgesqXvGl3S Rg4uSVp9bO58PwFoX2nEWfVuh/oaGS46RhobwEpmljoZx1pQrssar0jBRBkf6Qd/jknb y/yvTVY38EDC5iFMi6r6V8dGP1MtdlexYgJ5l6iMpM0vetCsN9UJPyCk3A9Ei6MKsn7t zJxcvSZjx+D4e4WND4HXcooqRUUhdnVp/A8ckE4lhhOtKQvDd6lffVofb2OizbFRrokT pmcg== X-Gm-Message-State: AIVw111NSl0/6i+Lq9VXJxymY2ZtTGOAO3DiO1/t/xGYrrVMEK/JyqSa daw8VSxEuw1ScFIgiIE= X-Received: by 10.28.154.85 with SMTP id c82mr7572501wme.151.1500977849010; Tue, 25 Jul 2017 03:17:29 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r199sm10645623wmd.11.2017.07.25.03.17.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 03:17:28 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Jul 2017 11:17:18 +0100 Message-Id: <20170725101719.2172-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170725101719.2172-1-ross.burton@intel.com> References: <20170725101719.2172-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/3] libpng: use SourceForge mirror X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The Gentoo mirror also deletes old versions when they're not used, so revert back to the canonical SourceForge site, adding /older-releases/ to MIRRORS to handle new releases moving the version we want. Original idea by Maxin B. John . Signed-off-by: Ross Burton --- meta/recipes-multimedia/libpng/libpng_1.6.29.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.29.bb b/meta/recipes-multimedia/libpng/libpng_1.6.29.bb index 8a3056e1a39..be327caaffc 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.29.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.29.bb @@ -6,11 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9acafc1325f8f8da80aeee94dbc1bda \ file://png.h;endline=144;md5=0b2aa20c7ff55d9411108317df8ff0c9" DEPENDS = "zlib" -SRC_URI = "${GENTOO_MIRROR}/libpng-${PV}.tar.xz \ - " +LIBV = "16" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz" SRC_URI[md5sum] = "3245dbd76ea91e1437507357b858ec97" SRC_URI[sha256sum] = "4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239" +MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/${PV}" + BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" inherit autotools binconfig-disabled pkgconfig From patchwork Tue Jul 25 10:17:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 108635 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp391681qge; Tue, 25 Jul 2017 03:17:54 -0700 (PDT) X-Received: by 10.98.55.5 with SMTP id e5mr19031215pfa.24.1500977874729; Tue, 25 Jul 2017 03:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500977874; cv=none; d=google.com; s=arc-20160816; b=gtbuEsG214vjFQcpUXh/JFAgAFRVRSEZH5XrIgBtDwPwX/iWMk/9P7U0mgONt+QpJl NHai+jIQEzuZH9tucJ+EPmVKB5K2XuTaBuaKXDN45CgtW4uiEvLdmMIC8hW+mgpj3huh fHvhEBbSkQkljzDVht1y7OboUeclT6HfcwTKZ/OMx5az/FfkrDUuiuyJbGEtC/F5/gr0 OjPugHyjAPdE5O8nCUYnbAhUgQoaTa/5xNaxJoo9bh9xy79YCmS2Dx8lLkRNe6NOpnTw bGlIPfNj+O1X6fUfIkzAvklyvvx/fPXtrIytVV2p9TvtzzDdaO5OOi0uku+OtYCn1ftD PTAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=WKwTfAPGSU39Us3NSMqWdKU8KmyF7vfi8wXVZfN+ATc=; b=fIldKkIdDx/m0rA54DJPIqoSYgHgqoIbRla2hRg3ZE/OhkMYSXHLk6vQM43YmANscz rsMysy1O4KF6/1PC7mbfQWB0TnfoXhlUoCC7cQ84uGP98QzRigpLgzGSim0jCc1xTuYb WH7rs3aebD7qKXh6ka7249E6QFEcsZ2YnUT329+ym/6Y65DQBsTLJrXkGy58ZkhhgmCR 1mvcSiTgRomECKWo1yi2nG9CScCO2hiO1zgsKwB9rk7AkvpcSrDZOT7uFl2Z8GWpL9YR yN0iZ43UJF73Zjj7TJU0Z4Irk2gz0+ckaxgTNxBLqY33RMH5l4s6vx7kvJjkyB5IXZE9 NImA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=NPueIvSd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 31si934601pli.22.2017.07.25.03.17.54; Tue, 25 Jul 2017 03:17:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=NPueIvSd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0294B78323; Tue, 25 Jul 2017 10:17:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by mail.openembedded.org (Postfix) with ESMTP id 852F97830D for ; Tue, 25 Jul 2017 10:17:29 +0000 (UTC) Received: by mail-wm0-f41.google.com with SMTP id c184so47772950wmd.0 for ; Tue, 25 Jul 2017 03:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZOqRsPmu7Xmao6aN8YQ0BeVtKd4eExTemqS3ogiMmKM=; b=NPueIvSdzUISmod+CBSrrD5rxwxKeWn5GPmZzNriCXMlEYRO/H2ONj+rEPlSfGsxpH htPKpVULtFQMn4x91m2gilbRSGNJxvLh+BwAH6PHxNif5Jn4P1O+kwKqWbEXEBJKXF15 Zht8PQdaYw9UHZcoTIDWnoodNE55/XpLMwhFGRvT/606179iIEianycGVRDmvQH8XTov XoVc25hY3n7fUm6JU9kkBpymbXIiwZwIzGnozN5FN9YWKAurTcpQO5zcVEkNuf6aGtlc NcZFaj8LbvfuwD8V7GU9ugEOeZZPVfEYVM3wXgPszmNV5D/rUGZWf1V5/pKfwZNToBTs xEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZOqRsPmu7Xmao6aN8YQ0BeVtKd4eExTemqS3ogiMmKM=; b=koXMys1UfRlVhID6cw6u22KV6+2fqPqPoit84fojoPftsPETA+66XvjGF41Z5KTJSC gZiPtYbpatSbhSG4Ce7x/EY8MGjB5b2a7FYzYr03XAdKUOhv7dVxnnjPtAPETlYunRmm XAat0sNnhJJ/tRFnBmeM+fX8RJMUZ0sAHfA2ax7U2y8ytbAx5d2VdjQ73E72+4ayOqtM GwinYy15hFjuodt8pFYTsotyiZUTHmNBKvtMGomOTCf9NfKupPwkpllq9OwlqJNrYFxh uIdbPQliPwEBQjKj4D4z8z8KuXpOsqO2UuHmDfew99IbPf167o4qyRK2AAqOPZcSLkGr dctQ== X-Gm-Message-State: AIVw110bZwDVH1WcnzQwNUFxZgqIum6VBns/vjRsX3j0N8Ik5cQydTXY IJVG726CtIvsm+lTDMU= X-Received: by 10.28.111.200 with SMTP id c69mr6674225wmi.115.1500977850082; Tue, 25 Jul 2017 03:17:30 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r199sm10645623wmd.11.2017.07.25.03.17.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 03:17:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Jul 2017 11:17:19 +0100 Message-Id: <20170725101719.2172-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170725101719.2172-1-ross.burton@intel.com> References: <20170725101719.2172-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/3] fetch/wget: mitigate a wget race condition when listing FTP directories X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org When wget is fetching a listing for a directory over FTP it writes to a temporary file called .listing in the current directory. If there are many such operations happening in parallel - for example during 'bitbake world -c checkpkg' - then up to BB_NUMBER_THREADS instances of wget will be racing to write to, read, and delete the same file. This results in various failures such as the file disappearing before wget has processed it or the file changing contents, which causes checkpkg to randomly fail. Mitigate the race condition by creating a temporary directory to run wget in when doing directory listings. [ YOCTO #11828 ] Signed-off-by: Ross Burton --- bitbake/lib/bb/fetch2/wget.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 208ee9bdd69..8ee9769d39b 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -90,13 +90,13 @@ class Wget(FetchMethod): self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate" - def _runwget(self, ud, d, command, quiet): + def _runwget(self, ud, d, command, quiet, workdir=None): progresshandler = WgetProgressHandler(d) logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command)) bb.fetch2.check_network_access(d, command, ud.url) - runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler) + runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler, workdir=workdir) def download(self, ud, d): """Fetch urls""" @@ -422,17 +422,16 @@ class Wget(FetchMethod): Run fetch checkstatus to get directory information """ f = tempfile.NamedTemporaryFile() + with tempfile.TemporaryDirectory(prefix="wget-index-") as workdir, tempfile.NamedTemporaryFile(dir=workdir, prefix="wget-listing-") as f: + agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" + fetchcmd = self.basecmd + fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'" + try: + self._runwget(ud, d, fetchcmd, True, workdir=workdir) + fetchresult = f.read() + except bb.fetch2.BBFetchException: + fetchresult = "" - agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" - fetchcmd = self.basecmd - fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'" - try: - self._runwget(ud, d, fetchcmd, True) - fetchresult = f.read() - except bb.fetch2.BBFetchException: - fetchresult = "" - - f.close() return fetchresult def _check_latest_version(self, url, package, package_regex, current_version, ud, d):