[Buildroot] [PATCH 0/5 v4] package/xenomai: add alternate download locations (branch yem/xenomai-custom)

[Buildroot] [PATCH 0/5 v4] package/xenomai: add alternate download locations (branch yem/xenomai-custom)

[Yann E. MORIN]

Hello All!

This series, initiated by Jan to get arbitrary git revision from the
official Xenomai git tree, was morphed and expanded by Yann to include
all the usual alternate download locations (like for the other packages
like linux, uboot...). Some refactoring to the version handling ensued.

Using a git tree is needed, as some versions are tagged, but not
tarballed. So, as a git download is needed, let's just expand that to
the other usual VCS as well.

The most complex is the first patch, with the shuffling around of the
version handling, but the rest is pretty straightforward.


Regards,
Yann E. MORIN.


The following changes since commit e2e57d56787b7a7d24ed3f9a97902d2bbd58c190

  docs/manual: run-tests test framework (2020-01-14 17:29:23 +0100)


are available in the git repository at:

  git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 65857f8b385110e6dfc59ae8011df19181006c1b

  package/xenomai: add support to download from a custom svn tree (2020-01-14 21:31:36 +0100)


----------------------------------------------------------------
Jan Kiszka (1):
      package/xenomai: add support to download from a custom git tree

Yann E. MORIN (4):
      package/xenomai: move the version setting to Kconfig
      package/xenomai: add support to download a custom tarball
      package/xenomai: add support to download from a custom Hg tree
      package/xenomai: add support to download from a custom svn tree

 package/xenomai/Config.in  | 50 +++++++++++++++++++++++++++++++++++++---------
 package/xenomai/xenomai.mk | 27 +++++++++++++++++++------
 2 files changed, 62 insertions(+), 15 deletions(-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/5 v4] package/xenomai: move the version setting to Kconfig

[Yann E. MORIN]

The xenomai version is decided in Kconfig, but the default value is
set in the .mk. This is unlike the other packages that have a version
choice (like linux, uboot...).

Move the value into Config.in.

This paves the way to using other custom sources, like from a git tree.

Note however that any existing configuration will need to be adapted to
the new settings. Adding legacy handling is non-trivial, so manual
intervention will be required.

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 26 +++++++++++++++++---------
 package/xenomai/xenomai.mk | 14 +++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 0cb0b343de..39d10ae695 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -41,17 +41,25 @@ config BR2_PACKAGE_XENOMAI
 
 if BR2_PACKAGE_XENOMAI
 
-config BR2_PACKAGE_XENOMAI_VERSION
-	string "Custom Xenomai version"
+choice
+	bool "Xenomai version"
 	help
-	  Manually select Xenomai version. If left empty, the default
-	  version will be used.
-
 	  Make sure that the selected version has a patch for your
-	  selected Linux kernel. If it does not, download and select
-	  a patch manually with
-	  BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
-	  Kernel -> Linux Kernel Extensions menu.
+	  selected Linux kernel. If it does not, download and select a
+	  patch manually with BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH,
+	  in the Linux Kernel -> Linux Kernel Extensions menu.
+
+config BR2_PACKAGE_XENOMAI_LATEST_VERSION
+	bool "Latest version (3.0.10)"
+
+config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION
+	bool "Custom version"
+
+endchoice
+
+config BR2_PACKAGE_XENOMAI_VERSION
+	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
+	default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION
 
 choice
 	prompt "Xenomai core"
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 5f389ac851..bab9d6997d 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -5,14 +5,14 @@
 ################################################################################
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
-ifeq ($(XENOMAI_VERSION),)
-XENOMAI_VERSION = 3.0.10
-else
-BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
-endif
-
-XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
+
+# Exclude all from the hash check, but the latest version.
+ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
+endif
+
 XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
 # GFDL is not included but refers to gnu.org
 XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \
-- 
2.20.1

[Buildroot] [PATCH 1/5 v4] package/xenomai: move the version setting to Kconfig

[Romain Naour]

Hi Yann,

Le 14/01/2020 ? 21:55, Yann E. MORIN a ?crit?:
> The xenomai version is decided in Kconfig, but the default value is
> set in the .mk. This is unlike the other packages that have a version
> choice (like linux, uboot...).
> 
> Move the value into Config.in.
> 
> This paves the way to using other custom sources, like from a git tree.
> 
> Note however that any existing configuration will need to be adapted to
> the new settings. Adding legacy handling is non-trivial, so manual
> intervention will be required.
> 
> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> cc: Romain Naour <romain.naour@gmail.com>
> Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ---
>  package/xenomai/Config.in  | 26 +++++++++++++++++---------
>  package/xenomai/xenomai.mk | 14 +++++++-------
>  2 files changed, 24 insertions(+), 16 deletions(-)
> 
> diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
> index 0cb0b343de..39d10ae695 100644
> --- a/package/xenomai/Config.in
> +++ b/package/xenomai/Config.in
> @@ -41,17 +41,25 @@ config BR2_PACKAGE_XENOMAI
>  
>  if BR2_PACKAGE_XENOMAI
>  
> -config BR2_PACKAGE_XENOMAI_VERSION
> -	string "Custom Xenomai version"
> +choice
> +	bool "Xenomai version"
>  	help
> -	  Manually select Xenomai version. If left empty, the default
> -	  version will be used.
> -
>  	  Make sure that the selected version has a patch for your
> -	  selected Linux kernel. If it does not, download and select
> -	  a patch manually with
> -	  BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
> -	  Kernel -> Linux Kernel Extensions menu.
> +	  selected Linux kernel. If it does not, download and select a
> +	  patch manually with BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH,
> +	  in the Linux Kernel -> Linux Kernel Extensions menu.
> +
> +config BR2_PACKAGE_XENOMAI_LATEST_VERSION
> +	bool "Latest version (3.0.10)"

Maybe just write 3.0.x ? (in order to not forget it while doing a version bump).

> +
> +config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION
> +	bool "Custom version"
> +
> +endchoice
> +
> +config BR2_PACKAGE_XENOMAI_VERSION
> +	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
> +	default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION
>  
>  choice
>  	prompt "Xenomai core"
> diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
> index 5f389ac851..bab9d6997d 100644
> --- a/package/xenomai/xenomai.mk
> +++ b/package/xenomai/xenomai.mk
> @@ -5,14 +5,14 @@
>  ################################################################################
>  
>  XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
> -ifeq ($(XENOMAI_VERSION),)
> -XENOMAI_VERSION = 3.0.10
> -else
> -BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
> -endif
> -
> -XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
>  XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
> +XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable

Not related to this patch, but we can update the url to use https instead.

> +
> +# Exclude all from the hash check, but the latest version.
> +ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y)
> +BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
> +endif

I noticed that the hash is still checked even if BR_NO_CHECK_HASH_FOR =
<archive> is provided.

What would happen with licenses file hash with legal-info if the hash change
between releases ?

Best regards,
Romain

> +
>  XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
>  # GFDL is not included but refers to gnu.org
>  XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \
> 

[Buildroot] [PATCH 2/5 v4] package/xenomai: add support to download a custom tarball

[Yann E. MORIN]

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 8 ++++++++
 package/xenomai/xenomai.mk | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 39d10ae695..326e1be737 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -55,11 +55,19 @@ config BR2_PACKAGE_XENOMAI_LATEST_VERSION
 config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION
 	bool "Custom version"
 
+config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
+	bool "Custom tarball"
+
 endchoice
 
 config BR2_PACKAGE_XENOMAI_VERSION
 	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
 	default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION
+	depends on !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
+
+config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL
+	string "URL of custom tarball"
+	depends on BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
 
 choice
 	prompt "Xenomai core"
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index bab9d6997d..d169c2e315 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -5,8 +5,14 @@
 ################################################################################
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
+ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL),y)
+XENOMAI_TARBALL = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL))
+XENOMAI_SOURCE = $(notdir $(XENOMAI_TARBALL))
+XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL)))
+else
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
 XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
+endif
 
 # Exclude all from the hash check, but the latest version.
 ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y)
-- 
2.20.1

[Buildroot] [PATCH 3/5 v4] package/xenomai: add support to download from a custom git tree

[Yann E. MORIN]

From: Jan Kiszka <jan.kiszka@siemens.com>

Soem versions are tagged, but not tarballed, so we need to be able to
retrieve them from git.

Usually, we do not have a default value for the repository, but unlike
for the kernel or the various bootloaders, the most prominent repository
for Xeniomai is upstream's official one (for the reason above, amongst
others), so we use that as a default.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 8 ++++++++
 package/xenomai/xenomai.mk | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 326e1be737..452b452039 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -58,8 +58,16 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION
 config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
 	bool "Custom tarball"
 
+config BR2_PACKAGE_XENOMAI_CUSTOM_GIT
+	bool "Custom Git repository"
+
 endchoice
 
+config BR2_PACKAGE_XENOMAI_REPOSITORY
+	string "URL of custom repository"
+	default "https://gitlab.denx.de/Xenomai/xenomai.git"
+	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT
+
 config BR2_PACKAGE_XENOMAI_VERSION
 	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
 	default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index d169c2e315..11c69000df 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -9,6 +9,9 @@ ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL),y)
 XENOMAI_TARBALL = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL))
 XENOMAI_SOURCE = $(notdir $(XENOMAI_TARBALL))
 XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL)))
+else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_GIT),y)
+XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
+XENOMAI_SITE_METHOD = git
 else
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
 XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
-- 
2.20.1

[Buildroot] [PATCH 4/5 v4] package/xenomai: add support to download from a custom Hg tree

[Yann E. MORIN]

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 8 ++++++--
 package/xenomai/xenomai.mk | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 452b452039..114aec3968 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -61,12 +61,16 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
 config BR2_PACKAGE_XENOMAI_CUSTOM_GIT
 	bool "Custom Git repository"
 
+config BR2_PACKAGE_XENOMAI_CUSTOM_HG
+	bool "Custom Mercurial repository"
+
 endchoice
 
 config BR2_PACKAGE_XENOMAI_REPOSITORY
 	string "URL of custom repository"
-	default "https://gitlab.denx.de/Xenomai/xenomai.git"
-	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT
+	default "https://gitlab.denx.de/Xenomai/xenomai.git" if BR2_PACKAGE_XENOMAI_CUSTOM_GIT
+	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT \
+		|| BR2_PACKAGE_XENOMAI_CUSTOM_HG
 
 config BR2_PACKAGE_XENOMAI_VERSION
 	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 11c69000df..e2a89cfeb9 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -12,6 +12,9 @@ XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL)))
 else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_GIT),y)
 XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
 XENOMAI_SITE_METHOD = git
+else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_HG),y)
+XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
+XENOMAI_SITE_METHOD = hg
 else
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
 XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
-- 
2.20.1

[Buildroot] [PATCH 4/5 v4] package/xenomai: add support to download from a custom Hg tree

[Romain Naour]

Hello Yann,

Le 14/01/2020 ? 21:55, Yann E. MORIN a ?crit?:
> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Cc: Romain Naour <romain.naour@gmail.com>
> Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ---
>  package/xenomai/Config.in  | 8 ++++++--
>  package/xenomai/xenomai.mk | 3 +++
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
> index 452b452039..114aec3968 100644
> --- a/package/xenomai/Config.in
> +++ b/package/xenomai/Config.in
> @@ -61,12 +61,16 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
>  config BR2_PACKAGE_XENOMAI_CUSTOM_GIT
>  	bool "Custom Git repository"
>  
> +config BR2_PACKAGE_XENOMAI_CUSTOM_HG
> +	bool "Custom Mercurial repository"

I'm not sure it is worth the effort to support mercurial and svn download for
xenomai.

Who want to use a different VCS than the upsream project ?
User may just want to easily cherry-pick patches it their custom git repository :)

Best regards,
Romain

> +
>  endchoice
>  
>  config BR2_PACKAGE_XENOMAI_REPOSITORY
>  	string "URL of custom repository"
> -	default "https://gitlab.denx.de/Xenomai/xenomai.git"
> -	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT
> +	default "https://gitlab.denx.de/Xenomai/xenomai.git" if BR2_PACKAGE_XENOMAI_CUSTOM_GIT
> +	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT \
> +		|| BR2_PACKAGE_XENOMAI_CUSTOM_HG
>  
>  config BR2_PACKAGE_XENOMAI_VERSION
>  	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
> diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
> index 11c69000df..e2a89cfeb9 100644
> --- a/package/xenomai/xenomai.mk
> +++ b/package/xenomai/xenomai.mk
> @@ -12,6 +12,9 @@ XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL)))
>  else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_GIT),y)
>  XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
>  XENOMAI_SITE_METHOD = git
> +else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_HG),y)
> +XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
> +XENOMAI_SITE_METHOD = hg
>  else
>  XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
>  XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
> 

[Buildroot] [PATCH 4/5 v4] package/xenomai: add support to download from a custom Hg tree

[Yann E. MORIN]

Romain, All,

On 2020-03-11 23:35 +0100, Romain Naour spake thusly:
> Le 14/01/2020 ? 21:55, Yann E. MORIN a ?crit?:
> > Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > Cc: Jan Kiszka <jan.kiszka@siemens.com>
> > Cc: Romain Naour <romain.naour@gmail.com>
> > Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> > ---
> >  package/xenomai/Config.in  | 8 ++++++--
> >  package/xenomai/xenomai.mk | 3 +++
> >  2 files changed, 9 insertions(+), 2 deletions(-)
> > 
> > diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
> > index 452b452039..114aec3968 100644
> > --- a/package/xenomai/Config.in
> > +++ b/package/xenomai/Config.in
> > @@ -61,12 +61,16 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
> >  config BR2_PACKAGE_XENOMAI_CUSTOM_GIT
> >  	bool "Custom Git repository"
> >  
> > +config BR2_PACKAGE_XENOMAI_CUSTOM_HG
> > +	bool "Custom Mercurial repository"
> 
> I'm not sure it is worth the effort to support mercurial and svn download for
> xenomai.
> 
> Who want to use a different VCS than the upsream project ?

Some people import stuff into their company-wide Mercurial repositories... ;-)

I am totally fine with dropping that, but we do have it for the
kernel, so if we want to be at par with all those packages that may use
custom versions, let's be consistent and offer the same set of options.

Regards,
Yann E. MORIN.

> User may just want to easily cherry-pick patches it their custom git repository :)
> 
> Best regards,
> Romain
> 
> > +
> >  endchoice
> >  
> >  config BR2_PACKAGE_XENOMAI_REPOSITORY
> >  	string "URL of custom repository"
> > -	default "https://gitlab.denx.de/Xenomai/xenomai.git"
> > -	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT
> > +	default "https://gitlab.denx.de/Xenomai/xenomai.git" if BR2_PACKAGE_XENOMAI_CUSTOM_GIT
> > +	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT \
> > +		|| BR2_PACKAGE_XENOMAI_CUSTOM_HG
> >  
> >  config BR2_PACKAGE_XENOMAI_VERSION
> >  	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
> > diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
> > index 11c69000df..e2a89cfeb9 100644
> > --- a/package/xenomai/xenomai.mk
> > +++ b/package/xenomai/xenomai.mk
> > @@ -12,6 +12,9 @@ XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL)))
> >  else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_GIT),y)
> >  XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
> >  XENOMAI_SITE_METHOD = git
> > +else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_HG),y)
> > +XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
> > +XENOMAI_SITE_METHOD = hg
> >  else
> >  XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
> >  XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
> > 
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 5/5 v4] package/xenomai: add support to download from a custom svn tree

[Yann E. MORIN]

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 6 +++++-
 package/xenomai/xenomai.mk | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 114aec3968..44973aab50 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -64,13 +64,17 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_GIT
 config BR2_PACKAGE_XENOMAI_CUSTOM_HG
 	bool "Custom Mercurial repository"
 
+config BR2_PACKAGE_XENOMAI_CUSTOM_SVN
+	bool "Custom Subversion repository"
+
 endchoice
 
 config BR2_PACKAGE_XENOMAI_REPOSITORY
 	string "URL of custom repository"
 	default "https://gitlab.denx.de/Xenomai/xenomai.git" if BR2_PACKAGE_XENOMAI_CUSTOM_GIT
 	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT \
-		|| BR2_PACKAGE_XENOMAI_CUSTOM_HG
+		|| BR2_PACKAGE_XENOMAI_CUSTOM_HG \
+		|| BR2_PACKAGE_XENOMAI_CUSTOM_SVN
 
 config BR2_PACKAGE_XENOMAI_VERSION
 	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index e2a89cfeb9..f7211bf856 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -15,6 +15,9 @@ XENOMAI_SITE_METHOD = git
 else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_HG),y)
 XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
 XENOMAI_SITE_METHOD = hg
+else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_SVN),y)
+XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY))
+XENOMAI_SITE_METHOD = svn
 else
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
 XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
-- 
2.20.1

[Buildroot] [PATCH 0/5 v4] package/xenomai: add alternate download locations (branch yem/xenomai-custom)

[Jan Kiszka]

On 14.01.20 21:55, Yann E. MORIN wrote:
> Hello All!
> 
> This series, initiated by Jan to get arbitrary git revision from the
> official Xenomai git tree, was morphed and expanded by Yann to include
> all the usual alternate download locations (like for the other packages
> like linux, uboot...). Some refactoring to the version handling ensued.
> 
> Using a git tree is needed, as some versions are tagged, but not
> tarballed. So, as a git download is needed, let's just expand that to
> the other usual VCS as well.
> 
> The most complex is the first patch, with the shuffling around of the
> version handling, but the rest is pretty straightforward.
> 
> 
> Regards,
> Yann E. MORIN.
> 
> 
> The following changes since commit e2e57d56787b7a7d24ed3f9a97902d2bbd58c190
> 
>    docs/manual: run-tests test framework (2020-01-14 17:29:23 +0100)
> 
> 
> are available in the git repository at:
> 
>    git://git.buildroot.org/~ymorin/git/buildroot.git
> 
> for you to fetch changes up to 65857f8b385110e6dfc59ae8011df19181006c1b
> 
>    package/xenomai: add support to download from a custom svn tree (2020-01-14 21:31:36 +0100)
> 
> 
> ----------------------------------------------------------------
> Jan Kiszka (1):
>        package/xenomai: add support to download from a custom git tree
> 
> Yann E. MORIN (4):
>        package/xenomai: move the version setting to Kconfig
>        package/xenomai: add support to download a custom tarball
>        package/xenomai: add support to download from a custom Hg tree
>        package/xenomai: add support to download from a custom svn tree
> 
>   package/xenomai/Config.in  | 50 +++++++++++++++++++++++++++++++++++++---------
>   package/xenomai/xenomai.mk | 27 +++++++++++++++++++------
>   2 files changed, 62 insertions(+), 15 deletions(-)
> 

Looks good to me.

Thanks,
Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

[Buildroot] [PATCH 0/5 v4] package/xenomai: add alternate download locations (branch yem/xenomai-custom)

[Thomas Petazzoni]

Hello,

On Tue, 14 Jan 2020 21:55:20 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Jan Kiszka (1):
>       package/xenomai: add support to download from a custom git tree

Applied.

> 
> Yann E. MORIN (4):
>       package/xenomai: move the version setting to Kconfig
>       package/xenomai: add support to download a custom tarball

Both applied.

>       package/xenomai: add support to download from a custom Hg tree
>       package/xenomai: add support to download from a custom svn tree

I have not applied those ones, I think it's too unlikely to ever be
needed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 0/5 v4] package/xenomai: add alternate download locations (branch yem/xenomai-custom)

[Yann E. MORIN]

Thomas, All,

On 2020-06-24 23:27 +0200, Thomas Petazzoni spake thusly:
> On Tue, 14 Jan 2020 21:55:20 +0100
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> > Jan Kiszka (1):
> >       package/xenomai: add support to download from a custom git tree
> Applied.
> > Yann E. MORIN (4):
> >       package/xenomai: move the version setting to Kconfig
> >       package/xenomai: add support to download a custom tarball
> Both applied.

Thanks! :-)

> >       package/xenomai: add support to download from a custom Hg tree
> >       package/xenomai: add support to download from a custom svn tree
> I have not applied those ones, I think it's too unlikely to ever be
> needed.

I agree, but then how often are people expected to use hg or svn to
store their kernel trees? Their Uboot trees?

Against all odds, some people are willing to go to those extremities and
suffer every day... ;-]

That's what I modeled xenomai after (the kernel and uboot, not the
suffering!). But OK, I don't care enough. ;-)

Thanks for applying the rest of the series.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'