* [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch
@ 2019-05-15 9:02 Sébastien Szymanski
2019-05-15 14:00 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: Sébastien Szymanski @ 2019-05-15 9:02 UTC (permalink / raw)
To: buildroot
With an URL Buildroot will be able to download the patch automatically.
Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com>
---
Config.in.legacy | 16 ++++++++++++++++
linux/Config.ext.in | 16 ++++++++++------
linux/linux-ext-xenomai.mk | 12 +++++++++---
3 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index a32cbcb6f2..f77ac1b828 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -144,6 +144,22 @@ endif
###############################################################################
+comment "Legacy options removed in 2019.08"
+
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
+ string "The BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH option has been removed"
+ help
+ The BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH has been removed in
+ favour of BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL.
+
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_WRAP
+ bool
+ default y if BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH != ""
+ select BR2_LEGACY
+
+# Note: BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH is still referenced from
+# linux/Config.ext.in
+
comment "Legacy options removed in 2019.05"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 32dacbdf06..4db694c2b8 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -22,18 +22,22 @@ 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"
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ string "Path/URL for Adeos patch file"
+ default BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH if BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH != "" # legacy
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 file:///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..e16f76ffb5 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -7,11 +7,17 @@
LINUX_EXTENSIONS += xenomai
# Adeos patch version
-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
-ifeq ($(XENOMAI_ADEOS_PATCH),)
+XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
+ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
+XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
+LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH_URL)
+BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH)
+endif
+
+ifeq ($(XENOMAI_ADEOS_PATCH_URL),)
XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
+XENOMAI_ADEOS_OPTS = --adeos=$(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH)
endif
# Prepare kernel patch
--
2.19.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch
2019-05-15 9:02 [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch Sébastien Szymanski
@ 2019-05-15 14:00 ` Thomas Petazzoni
2019-05-15 14:10 ` yann.morin at orange.com
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2019-05-15 14:00 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 15 May 2019 11:02:51 +0200
S?bastien Szymanski <sebastien.szymanski@armadeus.com> wrote:
> diff --git a/linux/Config.ext.in b/linux/Config.ext.in
> index 32dacbdf06..4db694c2b8 100644
> --- a/linux/Config.ext.in
> +++ b/linux/Config.ext.in
> @@ -22,18 +22,22 @@ 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"
> +config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
I don't think it makes sense to rename the option just for this. The
behavior is backward compatible, and adding the _URL prefix is not
really necessary.
> + string "Path/URL for Adeos patch file"
> + default BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH if BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH != "" # legacy
> 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 file:///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..e16f76ffb5 100644
> --- a/linux/linux-ext-xenomai.mk
> +++ b/linux/linux-ext-xenomai.mk
> @@ -7,11 +7,17 @@
> LINUX_EXTENSIONS += xenomai
>
> # Adeos patch version
> -XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
> -ifeq ($(XENOMAI_ADEOS_PATCH),)
> +XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
> +ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
> +XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
You can use $(basename ...) instead of $(shell basename ...)
> +LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH_URL)
> +BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH)
> +endif
Is this really backward compatible with a value of
XENOMAI_ADEOS_PATCH_URL = board/foo/ipipe-core-<version>.patch ?
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch
2019-05-15 14:00 ` Thomas Petazzoni
@ 2019-05-15 14:10 ` yann.morin at orange.com
2019-05-15 14:17 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: yann.morin at orange.com @ 2019-05-15 14:10 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2019-05-15 16:00 +0200, Thomas Petazzoni spake thusly:
> On Wed, 15 May 2019 11:02:51 +0200
> S?bastien Szymanski <sebastien.szymanski@armadeus.com> wrote:
[--SNIP--]
> > +ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
> > +XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
> You can use $(basename ...) instead of $(shell basename ...)
I think you meant $(notdir ...)
$(basename ...) does not seem to do what you seem to think it would do.
Regards,
Yann E. MORIN.
--
____________
.-----------------.--------------------: _ :------------------.
| Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON |
| +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN |
| +33 638.411.245 '--------------------: (_ `--, | X AGAINST |
| yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL |
'--------------------------------------:______/_____:------------------'
_________________________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.
This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch
2019-05-15 14:10 ` yann.morin at orange.com
@ 2019-05-15 14:17 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-05-15 14:17 UTC (permalink / raw)
To: buildroot
On Wed, 15 May 2019 16:10:11 +0200
<yann.morin@orange.com> wrote:
> > > +ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
> > > +XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
> > You can use $(basename ...) instead of $(shell basename ...)
>
> I think you meant $(notdir ...)
>
> $(basename ...) does not seem to do what you seem to think it would do.
Gah, indeed. Thanks for fixing my too-quick answer on this point :-/
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch
@ 2019-05-17 12:50 Sébastien Szymanski
0 siblings, 0 replies; 5+ messages in thread
From: Sébastien Szymanski @ 2019-05-17 12:50 UTC (permalink / raw)
To: buildroot
With an URL Buildroot will be able to download the patch automatically.
Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com>
---
Config.in.legacy | 16 ++++++++++++++++
linux/Config.ext.in | 16 ++++++++++------
linux/linux-ext-xenomai.mk | 12 +++++++++---
3 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index a32cbcb6f2..f77ac1b828 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -144,6 +144,22 @@ endif
###############################################################################
+comment "Legacy options removed in 2019.08"
+
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
+ string "The BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH option has been removed"
+ help
+ The BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH has been removed in
+ favour of BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL.
+
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_WRAP
+ bool
+ default y if BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH != ""
+ select BR2_LEGACY
+
+# Note: BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH is still referenced from
+# linux/Config.ext.in
+
comment "Legacy options removed in 2019.05"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 32dacbdf06..4db694c2b8 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -22,18 +22,22 @@ 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"
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ string "Path/URL for Adeos patch file"
+ default BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH if BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH != "" # legacy
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 file:///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..e16f76ffb5 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -7,11 +7,17 @@
LINUX_EXTENSIONS += xenomai
# Adeos patch version
-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
-ifeq ($(XENOMAI_ADEOS_PATCH),)
+XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
+ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
+XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
+LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH_URL)
+BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH)
+endif
+
+ifeq ($(XENOMAI_ADEOS_PATCH_URL),)
XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
+XENOMAI_ADEOS_OPTS = --adeos=$(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH)
endif
# Prepare kernel patch
--
2.19.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-17 12:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-15 9:02 [Buildroot] [PATCH 1/1] linux: xenomai: use URL for the ADEOS/IPIPE patch Sébastien Szymanski
2019-05-15 14:00 ` Thomas Petazzoni
2019-05-15 14:10 ` yann.morin at orange.com
2019-05-15 14:17 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2019-05-17 12:50 Sébastien Szymanski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox