From patchwork Tue Mar 14 18:30:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 738875 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vjNdR0cy4z9s1h for ; Wed, 15 Mar 2017 05:32:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g9M7DjmA"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D0AE988A75; Tue, 14 Mar 2017 18:32:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AEPM3tza3vCL; Tue, 14 Mar 2017 18:32:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3524B88A40; Tue, 14 Mar 2017 18:32:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7879C1C2836 for ; Tue, 14 Mar 2017 18:31:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 72D058897E for ; Tue, 14 Mar 2017 18:31:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RMk9mzR_SuYw for ; Tue, 14 Mar 2017 18:31:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6E8848884F for ; Tue, 14 Mar 2017 18:31:43 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id b5so25752366pgg.1 for ; Tue, 14 Mar 2017 11:31:43 -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=AliD/8Sb9DZWo9m96P6gqht26fcvV7X3hTkA1l/vEEE=; b=g9M7DjmARiaz9m5eNZN46vxEOBZ5naqZIZsF3iIgy15JTscyFHkkJvjhOo79cZCFb9 o/zkgzKydI9N+zl8IE+ILY2uU+8j40X7HvNlT72MBo5aIvm/TYupijM+1NKpyZ1dQuBv 4S0E9k/fqqvQfRrIMjFd4FBengoK0v2stmQMdrtvMUQzr4kaWlGrBH5+8grtsGT3UGxY caVhWPHDdpQ5BVD/AeBeuOFCx2xRYN0v6OKvGd63aCOrSwIcESteKMciOC6S1h3moJBN hHTzOeKeS9sYmD0QJHx/QOU7YRuyVXsx8lCfyiK0hF3SevM+gNGhTFb/GDVksRcKRR4c ekkQ== 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=AliD/8Sb9DZWo9m96P6gqht26fcvV7X3hTkA1l/vEEE=; b=HMnOvjsYuvqzBe/0vw7SY8edtZYnDBaA2dFiwEqFvPFxJ9J6CNqK6y9YXKyEPaKzUA AJ7vHkh+Eoh/YwWIgHO1QuOBYWlqOvuRsf0/Q71dncZeE/vCzfLiEANq6TgRM0O2811L hCpgJwswNNKP8hWngj+oqi4sVXnvan3A5XaO06zzEfZZDVByGrRHmWm2HUmvJTvIhaia ggHL+Ff4RAs/kZsOPMZK8b/HtFxPfu4gZLzZ0YwLimIipuzmXNLUaCwXHAtOggi1Qj3i EaTvHSPBXAKVPajpcA6rA0WYgEqC6Y911l7JE8b/2PRC7L8yazeLvW6DH2Jj0juJ1EEn SljA== X-Gm-Message-State: AFeK/H0mtz2kU8yLhSvdyzfyCuqPPg3lrMeaEVZcpoW5D7seJRpenmImQYZ3gzRC9rsFGA== X-Received: by 10.84.134.164 with SMTP id 33mr2419984plh.116.1489516303141; Tue, 14 Mar 2017 11:31:43 -0700 (PDT) Received: from octofox.metropolis (corp.Cadence.COM. [158.140.1.28]) by smtp.gmail.com with ESMTPSA id e13sm40192470pgn.38.2017.03.14.11.31.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Mar 2017 11:31:42 -0700 (PDT) From: Max Filippov To: buildroot@uclibc.org Date: Tue, 14 Mar 2017 11:30:48 -0700 Message-Id: <1489516252-3803-20-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1489516252-3803-1-git-send-email-jcmvbkbc@gmail.com> References: <1489516252-3803-1-git-send-email-jcmvbkbc@gmail.com> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 19/23] arch/xtensa: accept the overlay to be an URL X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: "Yann E. MORIN" It can be interesting to get the overlay from a remote server, rather than expect it to be present locally. Since that file can be any URL, we can't know its hash, so we just exclude it. Signed-off-by: "Yann E. MORIN" Signed-off-by: Max Filippov --- arch/arch.mk.xtensa | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index a346e31..9edbcfb 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -9,7 +9,15 @@ # tar xf $(ARCH_XTENSA_OVERLAY_FILE) -C $(@D) --strip-components=1 gcc # endif ################################################################################ -ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) +BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) +ifneq ($(filter http://% https://% ftp://% scp://%,$(BR_ARCH_XTENSA_OVERLAY_FILE)),) +ARCH_XTENSA_OVERLAY_URL = $(BR_ARCH_XTENSA_OVERLAY_FILE) +ARCH_XTENSA_OVERLAY_FILE = $(BR2_DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE)) +# Do not check that file, we can't know its hash +BR_NO_CHECK_HASH_FOR += $(notdir $(ARCH_XTENSA_OVERLAY_URL)) +else +ARCH_XTENSA_OVERLAY_FILE = $(BR_ARCH_XTENSA_OVERLAY_FILE) +endif ################################################################################ # arch-xtensa-overlay-extract -- extract an extensa overlay @@ -41,6 +49,10 @@ define arch-xtensa-overlay-inner ifneq ($$(ARCH_XTENSA_OVERLAY_FILE),) +# No need for a conditional here, the variable will be enpty when +# there is no URL to download. +$(1)_EXTRA_DOWNLOADS += $$(ARCH_XTENSA_OVERLAY_URL) + define $(1)_XTENSA_OVERLAY_EXTRACT $$(call arch-xtensa-overlay-extract,$$(@D),$$($(1)_ARCH_XTENSA_OVERLAY_COMPONENT)) endef