aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-02 22:11:20 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-02 22:11:20 +0200
commitf590097045ee5d399c42a2700475353361babcf9 (patch)
treec8d6feffb86fec6bc0399470392683d5a78051a2 /linux
parent2421c246b2ff8b9492ce98f2d2f4838f148fa51b (diff)
parent852df15f317fed37c780e79a253907ee1241cad7 (diff)
downloadbuildroot-f590097045ee5d399c42a2700475353361babcf9.tar.gz
buildroot-f590097045ee5d399c42a2700475353361babcf9.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/Config.ext.in13
-rw-r--r--linux/linux-ext-xenomai.mk12
2 files changed, 19 insertions, 6 deletions
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 32dacbdf06..14140d352c 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -22,18 +22,21 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
However, it is recommended to use the latest version of the
Adeos/Ipipe patch available at
- http://download.gna.org/adeos/patches
+ https://xenomai.org/downloads/ipipe/
Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
and PowerPC architectures.
config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
- string "Path for Adeos patch file"
+ string "Path/URL for Adeos patch file"
depends on BR2_LINUX_KERNEL_EXT_XENOMAI
help
- Optionally, explicitly specify the Adeos patch to use.
- Download it at http://download.gna.org/adeos/patches
- and verify that your kernel version in buildroot matches.
+ Optionally, explicitly specify where to find the Adeos
+ patch to use.
+ Examples:
+ https://xenomai.org/downloads/ipipe/v4.x/arm/ipipe-core-4.19.33-arm-2.patch
+ or /home/foo/ipipe-core-4.19.33-arm-2.patch
+ Please verify that your kernel version in Buildroot matches.
comment "xenomai needs a uClibc or glibc toolchain w/ threads"
depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index d066bb32ac..c7c112dac3 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -8,10 +8,20 @@ LINUX_EXTENSIONS += xenomai
# Adeos patch version
XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
+
+ifneq ($(filter ftp://% http://% https://%,$(XENOMAI_ADEOS_PATCH)),)
+XENOMAI_ADEOS_PATCH_NAME = $(notdir $(XENOMAI_ADEOS_PATCH))
+XENOMAI_ADEOS_PATCH_PATH = $(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH_NAME)
+LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH)
+BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH_NAME)
+else
+XENOMAI_ADEOS_PATCH_PATH = $(XENOMAI_ADEOS_PATCH)
+endif
+
ifeq ($(XENOMAI_ADEOS_PATCH),)
XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
+XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH_PATH)
endif
# Prepare kernel patch