package/xenomai: smokey's not a skin

That's a testsuite tool.

Rename XENOMAI_REMOVE_SKIN_LIST at this chance as it's cleaning
libraries, not only skins. Ditto, rename the hook accordingly.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
[yann.morin.1998@free.fr: also rename the hook]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 83ba8ca16282894392ec4c330177be7d21315d46..0cb0b343de7dcc85af4554fb1e500b2dcba01306 100644 (file)
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -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

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 16c486eb3465caec5a1804c597f7d4896f3c3111..40f9b4af78049cb43ac1070ec7ca0eeaf620c56e 100644 (file)
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -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,28 +109,25 @@ 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)
-
-define XENOMAI_REMOVE_SKINS
-       for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \
+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_LIBS
+       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
 
-XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_LIBS
 
 define XENOMAI_DEVICES
        /dev/rtheap  c  666  0  0  10  254  0  0  -