diff mbox

[50/51] arch/xtensa: accept the overlay to be an URL

Message ID fb88a640d6ca2ceb85fc96fa73a960af848c8930.1448289515.git.yann.morin.1998@free.fr
State Changes Requested
Headers show

Commit Message

Yann E. MORIN Nov. 23, 2015, 2:48 p.m. UTC 
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" <yann.morin.1998@free.fr>
Cc: Chris Zankel <chris@zankel.net>
---
 arch/arch.mk.xtensa | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni Nov. 23, 2015, 8:35 p.m. UTC | #1 
Dear Yann E. MORIN,

On Mon, 23 Nov 2015 15:48:20 +0100, Yann E. MORIN wrote:

> +# 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)

If all EXTRA_DOWNLOADS files are saved as part of legal-info, then you
can get rid of patches 38, 39 and 40.

Thomas
Yann E. MORIN Nov. 23, 2015, 9:28 p.m. UTC | #2 
Thomas, All,

On 2015-11-23 21:35 +0100, Thomas Petazzoni spake thusly:
> On Mon, 23 Nov 2015 15:48:20 +0100, Yann E. MORIN wrote:
> > +# 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)
> 
> If all EXTRA_DOWNLOADS files are saved as part of legal-info, then you
> can get rid of patches 38, 39 and 40.

And 37 too. But see my position on saving _EXTRA_DOWNLOADS (or
_ALL_DOWNLOADS for tha matters).

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa
index 238ba24..afaec3c 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
@@ -54,6 +62,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