From: Max Filippov <jcmvbkbc@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 4/7] arch/xtensa: accept the overlay to be an URL
Date: Sun, 9 Jul 2017 05:21:58 -0700 [thread overview]
Message-ID: <1499602921-25097-5-git-send-email-jcmvbkbc@gmail.com> (raw)
In-Reply-To: <1499602921-25097-1-git-send-email-jcmvbkbc@gmail.com>
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
Changes v1->v2:
- add ARCH_XTENSA_OVERLAY_URL to EXTRA_DOWNLOADS in package makefiles.
arch/arch.mk.xtensa | 10 +++++++++-
package/binutils/binutils.mk | 2 ++
package/gcc/gcc-final/gcc-final.mk | 1 +
package/gcc/gcc-initial/gcc-initial.mk | 1 +
package/gdb/gdb.mk | 2 ++
5 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa
index ecb9c1086a70..ba3e3025b7d0 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
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 8e26394fbf51..ec85ad69cbc0 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -127,7 +127,9 @@ define BINUTILS_XTENSA_OVERLAY_EXTRACT
$(call arch-xtensa-overlay-extract,$(@D),binutils)
endef
BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT
+BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
HOST_BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT
+HOST_BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
endif
ifeq ($(BR2_BINUTILS_ENABLE_LTO),y)
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index f3bc72efc719..8ca9847ed9d8 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -17,6 +17,7 @@ HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
+HOST_GCC_FINAL_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
endif
HOST_GCC_FINAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index dc7dff922818..c476b2faeb46 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -15,6 +15,7 @@ HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
+HOST_GCC_INITIAL_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
endif
HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 8ef01d6c12ea..73b0ea09d97d 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -49,7 +49,9 @@ define GDB_XTENSA_OVERLAY_EXTRACT
$(call arch-xtensa-overlay-extract,$(@D),gdb)
endef
GDB_POST_EXTRACT_HOOKS += GDB_XTENSA_OVERLAY_EXTRACT
+GDB_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
HOST_GDB_POST_EXTRACT_HOOKS += GDB_XTENSA_OVERLAY_EXTRACT
+HOST_GDB_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
endif
ifeq ($(GDB_FROM_GIT),y)
--
2.1.4
next prev parent reply other threads:[~2017-07-09 12:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-09 12:21 [Buildroot] [PATCH v2 0/7] xtensa overlay application rework Max Filippov
2017-07-09 12:21 ` [Buildroot] [PATCH v2 1/7] arch/xtensa: get rid of an intermediate blind kconfig option Max Filippov
2017-07-09 13:45 ` Thomas Petazzoni
2017-07-09 12:21 ` [Buildroot] [PATCH v2 2/7] arch/xtensa: allow specifying path to tarball file Max Filippov
2017-07-09 13:45 ` Thomas Petazzoni
2017-07-09 12:21 ` [Buildroot] [PATCH v2 3/7] arch/xtensa: accept the overlay to be compressed Max Filippov
2017-07-09 13:45 ` Thomas Petazzoni
2017-07-09 12:21 ` Max Filippov [this message]
2017-07-09 13:48 ` [Buildroot] [PATCH v2 4/7] arch/xtensa: accept the overlay to be an URL Thomas Petazzoni
2017-07-09 13:57 ` Yann E. MORIN
2017-07-09 15:24 ` Thomas Petazzoni
2017-07-09 12:21 ` [Buildroot] [PATCH v2 5/7] configs/qemu-xtensa: use overlay from the github repository Max Filippov
2017-07-09 12:22 ` [Buildroot] [PATCH v2 6/7] linux: apply xtensa overlay Max Filippov
2017-07-09 12:22 ` [Buildroot] [PATCH v2 7/7] uboot: " Max Filippov
2017-07-09 15:22 ` [Buildroot] [PATCH v2 0/7] xtensa overlay application rework Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499602921-25097-5-git-send-email-jcmvbkbc@gmail.com \
--to=jcmvbkbc@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox