All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options
@ 2017-04-19 19:59 Thomas De Schampheleire
  2017-04-19 19:59 ` [Buildroot] [PATCH 1/9] xenomai: update LICENSE_FILES Thomas De Schampheleire
                   ` (9 more replies)
  0 siblings, 10 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 19:59 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Between Xenomai 2.x and 3.x a number of changes happened in the Xenomai sources,
which were not taken into account in Buildroot. This would e.g. result in extra
unwanted files on the target root filesystem, or missing license files.

The first part of this series, patches 1 to 7 deals with this problem.
Patches 8 and 9 cover additional config options for Xenomai.


Thomas De Schampheleire (9):
  xenomai: update LICENSE_FILES
  xenomai: native skin is now called alchemy
  xenomai: group skin selection in separate menu and cleanup
  xenomai: add option for Smokey skin
  xenomai: update list of Analogy installed files
  xenomai: update list of testsuite files
  xenomai: restrict installed files further
  xenomai: add support for registry
  xenomai: add string option for additional configure options

 package/xenomai/Config.in  | 64 ++++++++++++++++++++++++++++++++++++----------
 package/xenomai/xenomai.mk | 52 +++++++++++++++++++++++++++----------
 2 files changed, 88 insertions(+), 28 deletions(-)

-- 
2.10.2

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 1/9] xenomai: update LICENSE_FILES
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
@ 2017-04-19 19:59 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 2/9] xenomai: native skin is now called alchemy Thomas De Schampheleire
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 19:59 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Xenomai sources contain much more license files than we currently list, so
complete the current list.

Based on:
    find | grep -Ei 'copying|license|copyright' | sort

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/xenomai.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 7c0ad34..456f200 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -15,7 +15,12 @@ XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
 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 lib/trank/COPYING kernel/cobalt/COPYING
+XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \
+	kernel/cobalt/posix/COPYING kernel/cobalt/rtdm/COPYING \
+	lib/alchemy/COPYING lib/analogy/COPYING \
+	lib/boilerplate/iniparser/LICENSE lib/boilerplate/COPYING \
+	lib/cobalt/COPYING lib/copperplate/COPYING lib/psos/COPYING \
+	lib/smokey/COPYING lib/trank/COPYING lib/vxworks/COPYING
 
 XENOMAI_DEPENDENCIES = host-pkgconf
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 2/9] xenomai: native skin is now called alchemy
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
  2017-04-19 19:59 ` [Buildroot] [PATCH 1/9] xenomai: update LICENSE_FILES Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 3/9] xenomai: group skin selection in separate menu and cleanup Thomas De Schampheleire
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Since the introduction of Xenomai 3, the native skin is dubbed Alchemy.
Update the config menu (but leave the symbol name to avoid hurting existing
users needlessly) and fix the unselected-skin cleanup code.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 5 +++--
 package/xenomai/xenomai.mk | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 8acf579..e633896 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -113,10 +113,11 @@ config BR2_PACKAGE_XENOMAI_ANALOGY
 	  and libraries
 
 config BR2_PACKAGE_XENOMAI_NATIVE_SKIN
-	bool "Native skin library"
+	bool "Alchemy (native) skin library"
 	default y
 	help
-	  This option allows to install the Native Xenomai skin
+	  This option allows to install the Alchemy Xenomai skin, previously
+	  called 'native'
 
 config BR2_PACKAGE_XENOMAI_POSIX_SKIN
 	bool "POSIX skin library"
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 456f200..e93fcf4 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -92,7 +92,7 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
 endif
 
-XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,native)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 3/9] xenomai: group skin selection in separate menu and cleanup
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
  2017-04-19 19:59 ` [Buildroot] [PATCH 1/9] xenomai: update LICENSE_FILES Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 2/9] xenomai: native skin is now called alchemy Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 4/9] xenomai: add option for Smokey skin Thomas De Schampheleire
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Clarify the Xenomai config options by grouping the skin-related options in a
separate menu.

Additionally:
- update proper capitalization of skin names
- sort entries
- replace 'skin library' by 'skin' to match the terminology in Xenomai
  sources

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index e633896..31d63f1 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -112,42 +112,46 @@ config BR2_PACKAGE_XENOMAI_ANALOGY
 	  This option allows to install the Xenomai Analogy utilities
 	  and libraries
 
+menu "Skin selection"
+
 config BR2_PACKAGE_XENOMAI_NATIVE_SKIN
-	bool "Alchemy (native) skin library"
+	bool "Alchemy (native) skin"
 	default y
 	help
 	  This option allows to install the Alchemy Xenomai skin, previously
 	  called 'native'
 
 config BR2_PACKAGE_XENOMAI_POSIX_SKIN
-	bool "POSIX skin library"
+	bool "POSIX skin"
 	default y
 	help
 	  This option allows to install the POSIX Xenomai skin
 
-config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
-	bool "VX-Works skin library"
-	help
-	  This option allows to install the VX-Works Xenomai skin
-
 config BR2_PACKAGE_XENOMAI_PSOS_SKIN
-	bool "PSOS skin library"
+	bool "pSOS skin"
 	help
-	  This option allows to install the PSOS Xenomai skin
+	  This option allows to install the pSOS Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_RTAI_SKIN
-	bool "RTAI skin library"
+	bool "RTAI skin"
 	help
 	  This option allows to install the RTAI Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_UITRON_SKIN
-	bool "uiTron skin library"
+	bool "uITRON skin"
 	help
-	  This option allows to install the uiTron Xenomai skin
+	  This option allows to install the uITRON Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_VRTX_SKIN
-	bool "VRTX skin library"
+	bool "VRTX skin"
 	help
 	  This option allows to install the VRTX Xenomai skin
 
+config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
+	bool "VxWorks skin"
+	help
+	  This option allows to install the VxWorks Xenomai skin
+
+endmenu
+
 endif
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 4/9] xenomai: add option for Smokey skin
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (2 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 3/9] xenomai: group skin selection in separate menu and cleanup Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 5/9] xenomai: update list of Analogy installed files Thomas De Schampheleire
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Xenomai has a skin 'Smokey' that Buildroot is currently unaware of, which
means that the associated files are present on target even though most users
will not need them.

Add a config option and associated logic to remove the skin if not selected.

Additionally, fixup order of VxWorks skin removal entry.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 5 +++++
 package/xenomai/xenomai.mk | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 31d63f1..d6474bd 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -137,6 +137,11 @@ config BR2_PACKAGE_XENOMAI_RTAI_SKIN
 	help
 	  This option allows to install the RTAI Xenomai skin
 
+config BR2_PACKAGE_XENOMAI_SMOKEY_SKIN
+	bool "Smokey skin"
+	help
+	  This option allows to install the Smokey Xenomai skin
+
 config BR2_PACKAGE_XENOMAI_UITRON_SKIN
 	bool "uITRON skin"
 	help
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index e93fcf4..0866144 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -94,10 +94,11 @@ endif
 
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
-XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_SMOKEY_SKIN),,smokey)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
 
 define XENOMAI_REMOVE_SKINS
@@ -106,6 +107,9 @@ define XENOMAI_REMOVE_SKINS
 		if [ $$i == "posix" ] ; then \
 			rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \
 		fi ; \
+		if [ $$i == "smokey" ] ; then \
+			rm -f $(TARGET_DIR)/usr/bin/smokey* ; \
+		fi ; \
 	done
 endef
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 5/9] xenomai: update list of Analogy installed files
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (3 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 4/9] xenomai: add option for Smokey skin Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 6/9] xenomai: update list of testsuite files Thomas De Schampheleire
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Since Xenomai 3, the list of files installed for Analogy is longer, causing
the extra files to remain on the target filesystem even if Analogy is not
selected.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/xenomai.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 0866144..a9cb296 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -81,11 +81,13 @@ endif
 
 ifeq ($(BR2_PACKAGE_XENOMAI_ANALOGY),)
 define XENOMAI_REMOVE_ANALOGY
-	for i in cmd_bits cmd_read cmd_write insn_write \
-		insn_bits insn_read ; do \
+	for i in cmd_read cmd_write cmd_bits insn_read insn_write insn_bits \
+			wf_generate ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
-	rm -f $(TARGET_DIR)/usr/sbin/analogy_config
+	for i in analogy_config analogy_calibrate ; do \
+		rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
+	done
 	rm -f $(TARGET_DIR)/usr/lib/libanalogy.*
 endef
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 6/9] xenomai: update list of testsuite files
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (4 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 5/9] xenomai: update list of Analogy installed files Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 7/9] xenomai: restrict installed files further Thomas De Schampheleire
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Since Xenomai 3, the list of installed binaries/scripts of the testsuite is
different than before.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/xenomai.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index a9cb296..30bdcdb 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -56,13 +56,11 @@ XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
 ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
 define XENOMAI_REMOVE_TESTSUITE
 	rm -rf $(TARGET_DIR)/usr/share/xenomai/
-	for i in klatency rtdm xeno xeno-load check-vdso \
-		irqloop cond-torture-posix switchtest arith \
-		sigtest clocktest cyclictest latency wakeup-time \
-		xeno-test cond-torture-native mutex-torture-posix \
-		mutex-torture-native ; do \
+	for i in clocktest gpiotest latency spitest switchtest \
+		xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
+	rm -rf $(TARGET_DIR)/usr/demo/
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 7/9] xenomai: restrict installed files further
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (5 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 6/9] xenomai: update list of testsuite files Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-19 20:00 ` [Buildroot] [PATCH 8/9] xenomai: add support for registry Thomas De Schampheleire
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Xenomai 3 installs quite some utils and other programs to the target
filesystem, many of which will not be used by most users.

As it is currently unclear which utils are effectively useful, and as it is
undesirable to create config options for each individual util, remove all
remaining utils such that only the Xenomai libraries remain.

At the point it becomes clear that certain utils _are_ desired by some
users, we can identify how to group them in relevant config options.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/xenomai.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 30bdcdb..99f62f0 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -45,13 +45,19 @@ else
 XENOMAI_CONF_OPTS += --disable-smp
 endif
 
-define XENOMAI_REMOVE_DEVFILES
-	for i in xeno-config xeno-info wrap-link.sh ; do \
+# Some of these files may be desired by some users -- at that point specific
+# config options need to be added to keep a particular set.
+define XENOMAI_REMOVE_UNNEEDED_FILES
+	for i in xeno xeno-config xeno-info wrap-link.sh ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
+	for i in autotune corectl hdb rtnet nomaccfg rtcfg rtifconfig \
+		rtiwconfig rtping rtroute tdmacfg rtps slackspot version; do \
+		rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
+	done
 endef
 
-XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES
 
 ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
 define XENOMAI_REMOVE_TESTSUITE
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 8/9] xenomai: add support for registry
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (6 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 7/9] xenomai: restrict installed files further Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-20 21:12   ` Thomas Petazzoni
  2017-04-19 20:00 ` [Buildroot] [PATCH 9/9] xenomai: add string option for additional configure options Thomas De Schampheleire
  2017-04-20 21:11 ` [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas Petazzoni
  9 siblings, 1 reply; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Add a config option to enable the Xenomai registry, which allows accessing
internal Xenomai state.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 20 ++++++++++++++++++++
 package/xenomai/xenomai.mk |  7 +++++++
 2 files changed, 27 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index d6474bd..09e18bf 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -96,6 +96,26 @@ config BR2_PACKAGE_XENOMAI_ENABLE_SMP
 
 	  http://xenomai.org/troubleshooting-a-dual-kernel-configuration/#feature_mismatch_missing8221smpnosmp8221
 
+config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
+	bool "Enable registry"
+	select BR2_PACKAGE_LIBFUSE
+	depends on !BR2_STATIC_LIBS # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
+	help
+	  Xenomai APIs can export their internal state through a
+	  pseudo-filesystem, whose files may be read to obtain information about
+	  the existing real-time objects, such as tasks, semaphores, message
+	  queues and so on.
+
+config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH
+	string "Custom registry root path"
+	depends on BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
+	help
+	  Specify the root path of the registry here.
+	  To use the Xenomai default (currently: /var/run/xenomai), leave this
+	  option empty.
+
 config BR2_PACKAGE_XENOMAI_TESTSUITE
 	bool "Install testsuite"
 	help
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 99f62f0..31424a1 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -45,6 +45,13 @@ else
 XENOMAI_CONF_OPTS += --disable-smp
 endif
 
+ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY),y)
+XENOMAI_DEPENDENCIES += libfuse
+XENOMAI_CONF_OPTS += --enable-registry$(if $(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH)),=$(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH)))
+else
+XENOMAI_CONF_OPTS += --disable-registry
+endif
+
 # Some of these files may be desired by some users -- at that point specific
 # config options need to be added to keep a particular set.
 define XENOMAI_REMOVE_UNNEEDED_FILES
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 9/9] xenomai: add string option for additional configure options
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (7 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 8/9] xenomai: add support for registry Thomas De Schampheleire
@ 2017-04-19 20:00 ` Thomas De Schampheleire
  2017-04-20 21:12   ` Thomas Petazzoni
  2017-04-20 21:11 ` [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas Petazzoni
  9 siblings, 1 reply; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-19 20:00 UTC (permalink / raw)
  To: buildroot

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Xenomai has many configure options that users may or may not want to set.
Providing individual Buildroot config options for every single one of them
is not maintainable.

Therefore, add a string option to allow the needed flexibility.
Important options, or those that have 'select/depends on' impact, can still
be turned into real Buildroot config options.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/xenomai/Config.in  | 6 ++++++
 package/xenomai/xenomai.mk | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 09e18bf..96e478e 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -116,6 +116,12 @@ config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH
 	  To use the Xenomai default (currently: /var/run/xenomai), leave this
 	  option empty.
 
+config BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS
+	string "Additional configure options"
+	help
+	  Specify any additional options to pass to the configure script here.
+	  See Xenomai documentation for details.
+
 config BR2_PACKAGE_XENOMAI_TESTSUITE
 	bool "Install testsuite"
 	help
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 31424a1..4044725 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -52,6 +52,8 @@ else
 XENOMAI_CONF_OPTS += --disable-registry
 endif
 
+XENOMAI_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS))
+
 # Some of these files may be desired by some users -- at that point specific
 # config options need to be added to keep a particular set.
 define XENOMAI_REMOVE_UNNEEDED_FILES
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options
  2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
                   ` (8 preceding siblings ...)
  2017-04-19 20:00 ` [Buildroot] [PATCH 9/9] xenomai: add string option for additional configure options Thomas De Schampheleire
@ 2017-04-20 21:11 ` Thomas Petazzoni
  2017-04-21 20:33   ` Thomas De Schampheleire
  9 siblings, 1 reply; 14+ messages in thread
From: Thomas Petazzoni @ 2017-04-20 21:11 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, 19 Apr 2017 21:59:58 +0200, Thomas De Schampheleire wrote:

> Thomas De Schampheleire (9):
>   xenomai: update LICENSE_FILES
>   xenomai: native skin is now called alchemy
>   xenomai: group skin selection in separate menu and cleanup
>   xenomai: add option for Smokey skin
>   xenomai: update list of Analogy installed files
>   xenomai: update list of testsuite files
>   xenomai: restrict installed files further
>   xenomai: add support for registry
>   xenomai: add string option for additional configure options

I've applied the entire series, with some changes on PATCH 8/9 and 9/9.
I'll reply to the patches themselves.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 8/9] xenomai: add support for registry
  2017-04-19 20:00 ` [Buildroot] [PATCH 8/9] xenomai: add support for registry Thomas De Schampheleire
@ 2017-04-20 21:12   ` Thomas Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2017-04-20 21:12 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, 19 Apr 2017 22:00:06 +0200, Thomas De Schampheleire wrote:

> +config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
> +	bool "Enable registry"
> +	select BR2_PACKAGE_LIBFUSE
> +	depends on !BR2_STATIC_LIBS # libfuse
> +	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
> +	depends on BR2_USE_MMU # libfuse

Some "depends on" -> a Config.in comment is needed, so I've added one.

> +	help
> +	  Xenomai APIs can export their internal state through a
> +	  pseudo-filesystem, whose files may be read to obtain information about

Line too long. Please run check-package! :-)

> +	  Specify the root path of the registry here.
> +	  To use the Xenomai default (currently: /var/run/xenomai), leave this

Line too long. Please run check-package! :-)

> +ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY),y)
> +XENOMAI_DEPENDENCIES += libfuse
> +XENOMAI_CONF_OPTS += --enable-registry$(if $(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH)),=$(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH)))

Gah, this is really not pretty. I've changed this to:

XENOMAI_REGISTRY_PATH = $(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH))
ifeq ($(XENOMAI_REGISTRY_PATH),)
XENOMAI_CONF_OPTS += --enable-registry
else
XENOMAI_CONF_OPTS += --enable-registry=$(XENOMAI_REGISTRY_PATH)
endif

which I believe is a lot more readable.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 9/9] xenomai: add string option for additional configure options
  2017-04-19 20:00 ` [Buildroot] [PATCH 9/9] xenomai: add string option for additional configure options Thomas De Schampheleire
@ 2017-04-20 21:12   ` Thomas Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2017-04-20 21:12 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, 19 Apr 2017 22:00:07 +0200, Thomas De Schampheleire wrote:

> +config BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS
> +	string "Additional configure options"
> +	help
> +	  Specify any additional options to pass to the configure script here.

Line too long. Please use check-package! :-)

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options
  2017-04-20 21:11 ` [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas Petazzoni
@ 2017-04-21 20:33   ` Thomas De Schampheleire
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2017-04-21 20:33 UTC (permalink / raw)
  To: buildroot

2017-04-20 23:11 GMT+02:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Hello,
>
> On Wed, 19 Apr 2017 21:59:58 +0200, Thomas De Schampheleire wrote:
>
>> Thomas De Schampheleire (9):
>>   xenomai: update LICENSE_FILES
>>   xenomai: native skin is now called alchemy
>>   xenomai: group skin selection in separate menu and cleanup
>>   xenomai: add option for Smokey skin
>>   xenomai: update list of Analogy installed files
>>   xenomai: update list of testsuite files
>>   xenomai: restrict installed files further
>>   xenomai: add support for registry
>>   xenomai: add string option for additional configure options
>
> I've applied the entire series, with some changes on PATCH 8/9 and 9/9.
> I'll reply to the patches themselves.

Thanks!
Sorry about the line lengths, I'm used to 80 character limits and
didn't realize a different limit is used here, nor was I already used
to using checkpackage. I'll remember it for next time!

Best regards,
Thomas

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2017-04-21 20:33 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-19 19:59 [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas De Schampheleire
2017-04-19 19:59 ` [Buildroot] [PATCH 1/9] xenomai: update LICENSE_FILES Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 2/9] xenomai: native skin is now called alchemy Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 3/9] xenomai: group skin selection in separate menu and cleanup Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 4/9] xenomai: add option for Smokey skin Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 5/9] xenomai: update list of Analogy installed files Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 6/9] xenomai: update list of testsuite files Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 7/9] xenomai: restrict installed files further Thomas De Schampheleire
2017-04-19 20:00 ` [Buildroot] [PATCH 8/9] xenomai: add support for registry Thomas De Schampheleire
2017-04-20 21:12   ` Thomas Petazzoni
2017-04-19 20:00 ` [Buildroot] [PATCH 9/9] xenomai: add string option for additional configure options Thomas De Schampheleire
2017-04-20 21:12   ` Thomas Petazzoni
2017-04-20 21:11 ` [Buildroot] [PATCH 0/9] xenomai 3.x fixups and extra config options Thomas Petazzoni
2017-04-21 20:33   ` Thomas De Schampheleire

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.