package/xenomai: Fixes, updates, enhancements
v2 cover package/xenomai: Fixes, updates, enhancements
Changes in v2:
- add option to choose git, rather then overloading BR2_PACKAGE_XENOMAI_VERSION
- use XENOMAI_AUTORECONF for git
- de-capitalize patch subjects
Jan
Jan Kiszka (4):
package/xenomai: smokey's not a skin
package/xenomai: bump version to 3.0.10
package/xenomai: allow to pull git revisions
package/xenomai: clean up wrappers cleanup
package/xenomai/Config.in | 28 ++++++++++++++++++++++------ package/xenomai/xenomai.hash | 2 +- package/xenomai/xenomai.mk | 41 +++++++++++++++++++++++------------------ 3 files changed, 46 insertions(+), 25 deletions(-)
Signature · 1 line
2.16.4
PATCH v2 1/4 package/xenomai: smokey's not a skin
From: Jan Kiszka <[email protected]>
That's a testsuite tool.
Rename XENOMAI_REMOVE_SKIN_LIST at this chance as it's cleaning libraries, not only skins.
--- package/xenomai/Config.in | 5 ----- package/xenomai/xenomai.mk | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 18 deletions(-)
package/xenomai/Config.in +0 -5
@@ -170,11 +170,6 @@ 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
package/xenomai/xenomai.mk +10 -13
@@ -73,7 +73,7 @@ XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) define XENOMAI_REMOVE_TESTSUITE rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in clocktest gpiotest latency spitest switchtest \ + for i in clocktest gpiotest latency smokey spitest switchtest \ xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \ rm -f $(TARGET_DIR)/usr/bin/$$i ; \ done
@@ -109,24 +109,21 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY 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_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) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_TESTSUITE),,smokey) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) define XENOMAI_REMOVE_SKINS - for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \ + for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \ rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ 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
Signature · 1 line
2.16.4
PATCH v2 1/4 package/xenomai: smokey's not a skin
Jan, All,
On 2019-12-19 09:24 +0100, Jan Kiszka spake thusly:
Quoted 6 lines
From: Jan Kiszka <[email protected]>
That's a testsuite tool.
Rename
XENOMAI_REMOVE_SKIN_LISTat this chance as it's cleaning libraries, not only skins.
I also renamed the hook accordingly, too, and applied to master. Thanks.
Regards,
Yann E. MORIN.
Quoted 76 lines
Signed-off-by Jan Kiszka <[email protected]>--- package/xenomai/Config.in | 5 ----- package/xenomai/xenomai.mk | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 18 deletions(-)package/xenomai/Config.in +0
-5@@ -170,11 +170,6 @@ 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" helppackage/xenomai/xenomai.mk +10
-13@@ -73,7 +73,7 @@ XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) define XENOMAI_REMOVE_TESTSUITE rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in clocktest gpiotest latency spitest switchtest \ + for i in clocktest gpiotest latency smokey spitest switchtest \ xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \ rm -f $(TARGET_DIR)/usr/bin/$$i ; \ done@@ -109,24 +109,21 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY 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_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) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_TESTSUITE),,smokey) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) define XENOMAI_REMOVE_SKINS - for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \ + for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \ rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ 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 endefSignature · 6 lines
2.16.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v2 2/4 package/xenomai: bump version to 3.0.10
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
--- package/xenomai/xenomai.hash | 2 +- package/xenomai/xenomai.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/xenomai/xenomai.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed; -sha256 9e4b879ee48e6423f76cba5882f41d129164fe977119080ff41ef531ee50dc4e xenomai-3.0.9.tar.bz2 +sha256 080f893d6ab8e3065285fbb482695477a0502b9490dccd1f744cebaac94691e5 xenomai-3.0.10.tar.bz2
package/xenomai/xenomai.mk +1 -1
@@ -6,7 +6,7 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 3.0.9 +XENOMAI_VERSION = 3.0.10 else BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif
Signature · 1 line
2.16.4
PATCH v2 3/4 package/xenomai: allow to pull git revisions
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Default remains the latest stable release, expressed by BR2_PACKAGE_XENOMAI_USE_RELEASE=y and an empty BR2_PACKAGE_XENOMAI_VERSION.
--- package/xenomai/Config.in | 23 ++++++++++++++++++++++- package/xenomai/xenomai.mk | 10 +++++++++- 2 files changed, 31 insertions(+), 2 deletions(-)
package/xenomai/Config.in +22 -1
@@ -41,8 +41,21 @@ config BR2_PACKAGE_XENOMAI if BR2_PACKAGE_XENOMAI +choice + prompt "Xenomai origin" + default BR2_PACKAGE_XENOMAI_USE_RELEASE + +config BR2_PACKAGE_XENOMAI_USE_RELEASE + bool "Release" + +config BR2_PACKAGE_XENOMAI_USE_GIT + bool "Git" + +endchoice + config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" + string "Xenomai version" + depends on BR2_PACKAGE_XENOMAI_USE_RELEASE help Manually select Xenomai version. If left empty, the default version will be used.
@@ -53,6 +66,14 @@ config BR2_PACKAGE_XENOMAI_VERSION BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux Kernel -> Linux Kernel Extensions menu. +config BR2_PACKAGE_XENOMAI_GIT_REVISION + string "Xenomai Git revision" + depends on BR2_PACKAGE_XENOMAI_USE_GIT + help + This option allows Buildroot to get a custom revision from + the Xenomai Git repository. This can be a SHA, a tag, or + even a branch (floating revision). + choice prompt "Xenomai core" default BR2_PACKAGE_XENOMAI_MERCURY
package/xenomai/xenomai.mk +9 -1
@@ -4,15 +4,23 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_XENOMAI_USE_GIT),y) +XENOMAI_REV = $(call qstrip,$(BR2_PACKAGE_XENOMAI_GIT_REVISION)) +XENOMAI_SITE = https://gitlab.denx.de/Xenomai/xenomai/-/archive/$(XENOMAI_REV) +XENOMAI_SOURCE = xenomai-$(XENOMAI_REV).tar.bz2 +XENOMAI_AUTORECONF = YES +BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) +else 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 +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 \
Signature · 1 line
2.16.4
PATCH v2 3/4 package/xenomai: allow to pull git revisions
Jan, All,
On 2019-12-19 09:24 +0100, Jan Kiszka spake thusly:
Quoted 7 lines
From: Jan Kiszka <[email protected]>
Default remains the latest stable release, expressed by BR2_PACKAGE_XENOMAI_USE_RELEASE=y and an empty
BR2_PACKAGE_XENOMAI_VERSION.Signed-off-by Jan Kiszka <[email protected]>
So I'm coming back to this remaining patch in your series. Sorry it took so long since last time I worked on the series...
Quoted 33 lines
--- package/xenomai/Config.in | 23 ++++++++++++++++++++++- package/xenomai/xenomai.mk | 10 +++++++++- 2 files changed, 31 insertions(+), 2 deletions(-)package/xenomai/Config.in +14
-1@@ -41,8 +41,21 @@ config BR2_PACKAGE_XENOMAI if BR2_PACKAGE_XENOMAI +choice + prompt "Xenomai origin" + default BR2_PACKAGE_XENOMAI_USE_RELEASE + +config BR2_PACKAGE_XENOMAI_USE_RELEASE + bool "Release" + +config BR2_PACKAGE_XENOMAI_USE_GIT + bool "Git" + +endchoice + config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" + string "Xenomai version" + depends on BR2_PACKAGE_XENOMAI_USE_RELEASE help Manually select Xenomai version. If left empty, the default version will be used.
package/xenomai/Config.in config BR2_PACKAGE_XENOMAI_VERSION · line 75
Quoted 10 lines
package/xenomai/Config.in +7
-0@@ -53,6 +66,14 @@ config BR2_PACKAGE_XENOMAI_VERSION BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux Kernel -> Linux Kernel Extensions menu. +config BR2_PACKAGE_XENOMAI_GIT_REVISION + string "Xenomai Git revision" + depends on BR2_PACKAGE_XENOMAI_USE_GIT + help + This option allows Buildroot to get a custom revision from + the Xenomai Git repository. This can be a SHA, a tag, or + even a branch (floating revision).
So I know that you are (probably, hopefully) mimicking that construct from other packages, but I don't see why the same symbol can't be used for both a release version of a git reference; the telling-apart part is the choice above anyway, so:
config BR2_PACKAGE_XENOMAI_VERSION
bool "Xenomai version"
help
If downloading a release, leave empty for the default version, or specify a valid release version.
If downloading from git, this can be any commit-ish (e.g. a tag, or a hash).
(Note that I explicitly dropped the reference to using a branch name:
that is not supported and should not be doocumented at all.)
package/xenomai/xenomai.mk line 8
Quoted 13 lines
package/xenomai/Config.in +0
-0choice prompt "Xenomai core" default BR2_PACKAGE_XENOMAI_MERCURYpackage/xenomai/xenomai.mk +2
-0@@ -4,15 +4,23 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_XENOMAI_USE_GIT),y) +XENOMAI_REV = $(call qstrip,$(BR2_PACKAGE_XENOMAI_GIT_REVISION))
We really want that there *is* a variable named _VERSION because it is used in a lot of places, like naming the build directory. It is also dumped in the json generated by 'make show-info'.
And with the above comment, this can be rewrittent as:
XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
ifeq ($(BR2_PACKAGE_XENOMAI_USE_RELEASE),y)
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
else
XENOMAI_SITE = https://gitlab.denx.de/Xenomai/xenomai/-/archive/$(XENOMAI_VERSION)
BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
XENOMAI_AUTORECONF = YES
endifNote that those are simply-expanded variable; that is, their values are only final at the moment they are eventualyl expanded, so we can define XENOMAI_VERSION after XENOMAI_SOURCE, even if the former is used to define the latter.
Care to give that a spin and resubmit an updated patch, please?
Regards,
Yann E. MORIN.
Quoted 26 lines
package/xenomai/xenomai.mk +7
-1+XENOMAI_SITE = https://gitlab.denx.de/Xenomai/xenomai/-/archive/$(XENOMAI_REV) +XENOMAI_SOURCE = xenomai-$(XENOMAI_REV).tar.bz2 +XENOMAI_AUTORECONF = YES +BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) +else 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 +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 \Signature · 6 lines
2.16.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v2 4/4 package/xenomai: clean up wrappers cleanup
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
There is no posix.wrappers anymore, but cobalt and modechk. Those only play a role when building in combination with wrap-link.sh.
--- package/xenomai/xenomai.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/xenomai/xenomai.mk +3 -3
@@ -70,6 +70,9 @@ 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 cobalt modechk ; do \ + rm -f $(TARGET_DIR)/usr/lib/$$i.wrappers ; \ + 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 ; \
@@ -129,9 +132,6 @@ XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) define XENOMAI_REMOVE_SKINS for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \ rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ - if [ $$i == "posix" ] ; then \ - rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \ - fi ; \ done endef
Signature · 1 line
2.16.4
PATCH v2 4/4 package/xenomai: clean up wrappers cleanup
Jan, All,
On 2019-12-19 09:24 +0100, Jan Kiszka spake thusly:
Quoted 4 lines
From: Jan Kiszka <[email protected]>
There is no posix.wrappers anymore, but cobalt and modechk. Those only play a role when building in combination with
wrap-link.sh.
If that change already existed with the current 3.0.9, then this patch should come before current patch 2.
If the change was done in 3.0.10, then this patch should be folded with patch 2, which introduces 3.0.10.
In any case, it must come before the patch that introduces the from-git posibility, which should be last.
No need to respin if there only re-ordering; just reply and I can do th reordering appropriately.
Regards,
Yann E. MORIN.
Quoted 36 lines
Signed-off-by Jan Kiszka <[email protected]>--- package/xenomai/xenomai.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/xenomai/xenomai.mk +3
-3@@ -70,6 +70,9 @@ 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 cobalt modechk ; do \ + rm -f $(TARGET_DIR)/usr/lib/$$i.wrappers ; \ + 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 ; \@@ -129,9 +132,6 @@ XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) define XENOMAI_REMOVE_SKINS for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \ rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ - if [ $$i == "posix" ] ; then \ - rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \ - fi ; \ done endefSignature · 6 lines
2.16.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v2 4/4 package/xenomai: clean up wrappers cleanup
Quoted 10 lines · Yann E. MORIN
Jan, All,
On 2019-12-19 09:24 +0100, Jan Kiszka spake thusly:
Quoted 4 lines
From: Jan Kiszka <[email protected]>
There is no posix.wrappers anymore, but cobalt and modechk. Those only play a role when building in combination with
wrap-link.sh.If that change already existed with the current 3.0.9, then this patch should come before current patch 2.
posix.wrappers was renamed in 2013, before the Xenomai 3 release.
Quoted 9 lines
If the change was done in 3.0.10, then this patch should be folded with patch 2, which introduces 3.0.10.
In any case, it must come before the patch that introduces the from-git posibility, which should be last.
No need to respin if there only re-ordering; just reply and I can do th reordering appropriately.
Feel free to reorder, thanks.
Jan
Quoted 41 lines
Regards,
Yann E. MORIN.Quoted 36 lines
Signed-off-by Jan Kiszka <[email protected]>--- package/xenomai/xenomai.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/xenomai/xenomai.mk +3
-3@@ -70,6 +70,9 @@ 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 cobalt modechk ; do \ + rm -f $(TARGET_DIR)/usr/lib/$$i.wrappers ; \ + 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 ; \@@ -129,9 +132,6 @@ XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) define XENOMAI_REMOVE_SKINS for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \ rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ - if [ $$i == "posix" ] ; then \ - rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \ - fi ; \ done endefSignature · 6 lines
2.16.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
v2 cover package/xenomai: Fixes, updates, enhancements
In reply to Jan KiszkaJan, All,
On 2019-12-19 09:24 +0100, Jan Kiszka spake thusly:
Quoted 5 lines
Changes in v2:
- add option to choose git, rather then overloadingBR2_PACKAGE_XENOMAI_VERSION
- useXENOMAI_AUTORECONFfor git
- de-capitalize patch subjects
Quoted 7 lines
Jan
Jan Kiszka (4):
package/xenomai: smokey's not a skin
package/xenomai: bump version to 3.0.10
package/xenomai: allow to pull git revisions
package/xenomai: clean up wrappers cleanup
I've applied 1-4-2 in this order, and left 3 out for later review for the moment.
I'll reply to patch 1 with further comment.
Thanks!
Regards,
Yann E. MORIN.
Quoted 12 lines
package/xenomai/Config.in | 28 ++++++++++++++++++++++------ package/xenomai/xenomai.hash | 2 +- package/xenomai/xenomai.mk | 41 +++++++++++++++++++++++------------------ 3 files changed, 46 insertions(+), 25 deletions(-)Signature · 6 lines
2.16.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'