From: Florian Bezdeka <florian.bezdeka@siemens.com>
To: xenomai@lists.linux.dev, jan.kiszka@siemens.com
Cc: Florian Bezdeka <florian.bezdeka@siemens.com>
Subject: [PATCH 2/2] debian: Extract xenomai tests into separate package (xenomai-testsuite)
Date: Thu, 27 Apr 2023 16:32:11 +0200 [thread overview]
Message-ID: <20230426-florian-debianization-extract-testsuite-v1-2-0a957cde7b74@siemens.com> (raw)
In-Reply-To: <20230426-florian-debianization-extract-testsuite-v1-0-0a957cde7b74@siemens.com>
Previously the test suite was part of the xenomai-runtime package which
was missing some dependencies like gdb for optimization reasons.
Pulling in development stuff like gdb was no option for production
systems.
Moving the testsuite into a separate package allows us to model all the
necessary dependencies correctly. Even adding "gdb" to the dependency
list is now possible because the testsuite (with all the dev
dependencies) is normally not installed on production systems.
/usr/lib/xenomai/bootstrap*.o is moved from the runtime package into
the libxenomai-dev package.
We have three packages providing /usr/bin stuff now. Listing all the
binaries inside the .install files allows cleaning up hacks from
debian/rules.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
debian/control | 18 +++++++++++++++---
debian/libxenomai-dev.install | 1 +
debian/rules | 2 --
debian/xenomai-runtime.install | 8 ++++++--
debian/xenomai-testsuite.install | 2 ++
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index 857d8ff8f..9855de198 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.xenomai.org/
Package: xenomai-runtime
Section: devel
Architecture: amd64 arm armeb armel armhf arm64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, netcat
+Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: xenomai-kernel-source
Replaces: xenomai
Conflicts: xenomai
@@ -20,8 +20,7 @@ Description: Xenomai runtime utilities
environment. Xenomai provides its own API and emulation layers ("skins") to
make migration from other RTOS easier. Examples are: pSOS+, VxWorks, POSIX.
.
- This package contains the runtime programs and the testsuite for the Xenomai
- realtime system.
+ This package contains the runtime programs for the Xenomai realtime system.
Package: xenomai-kernel-source
Section: kernel
@@ -75,3 +74,16 @@ Description: Headers and static libs for Xenomai
.
This package contains development files (header files), the static libraries
and scripts used to compile realtime applications.
+
+Package: xenomai-testsuite
+Section: devel
+Architecture: amd64 arm armeb armel armhf arm64 i386
+Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, netcat, gdb
+Description: Xenomai testsuite
+ Xenomai is a real-time development framework cooperating with the Linux
+ kernel in order to provide a pervasive, interface-agnostic, hard real-time
+ support to user-space applications, seamlessly integrated into the GNU/Linux
+ environment. Xenomai provides its own API and emulation layers ("skins") to
+ make migration from other RTOS easier. Examples are: pSOS+, VxWorks, POSIX.
+ .
+ This package contains the testsuite for the Xenomai realtime system.
diff --git a/debian/libxenomai-dev.install b/debian/libxenomai-dev.install
index a8e6b4e33..b57231585 100644
--- a/debian/libxenomai-dev.install
+++ b/debian/libxenomai-dev.install
@@ -6,3 +6,4 @@ usr/lib/*.so
usr/lib/modechk.wrappers
usr/lib/cobalt.wrappers
usr/lib/dynlist.ld
+usr/lib/xenomai/bootstrap*.o
diff --git a/debian/rules b/debian/rules
index 600947346..7664bf21c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,8 +72,6 @@ install: build
for f in $(CURDIR)/kernel/cobalt/udev/*.rules ; do \
cat $$f >> $(CURDIR)/debian/libxenomai1/etc/udev/xenomai.rules ; \
done
- # xeno-config should be only in libxenomai-dev
- rm -f $(CURDIR)/debian/xenomai-runtime/usr/bin/xeno-config
install -m 644 debian/libxenomai1.modprobe $(CURDIR)/debian/libxenomai1/etc/modprobe.d/xenomai.conf
# remove empty directory
rm -rf $(CURDIR)/debian/xenomai-doc/usr/share/doc/xenomai-doc/ps
diff --git a/debian/xenomai-runtime.install b/debian/xenomai-runtime.install
index 372b0e402..77a4c445a 100644
--- a/debian/xenomai-runtime.install
+++ b/debian/xenomai-runtime.install
@@ -1,3 +1,7 @@
-usr/bin
+usr/bin/cmd_*
+usr/bin/insn_*
+usr/bin/rtcan*
+usr/bin/wf_generate
+usr/bin/wrap-link.sh
+usr/bin/xeno
usr/sbin
-usr/lib/xenomai
diff --git a/debian/xenomai-testsuite.install b/debian/xenomai-testsuite.install
new file mode 100644
index 000000000..167188d11
--- /dev/null
+++ b/debian/xenomai-testsuite.install
@@ -0,0 +1,2 @@
+usr/bin/xeno-test
+usr/lib/xenomai/testsuite
\ No newline at end of file
--
2.39.2
next prev parent reply other threads:[~2023-04-27 14:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 14:32 [PATCH 0/2] debian: Move testsuite (smokey) into a separate package Florian Bezdeka
2023-04-27 14:32 ` [PATCH 1/2] lib/boilerplate: Do not remove $(DESTDIR)$(libdir)/xenomai on uninstall Florian Bezdeka
2023-04-27 14:32 ` Florian Bezdeka [this message]
2023-04-30 9:22 ` [PATCH 0/2] debian: Move testsuite (smokey) into a separate package Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230426-florian-debianization-extract-testsuite-v1-2-0a957cde7b74@siemens.com \
--to=florian.bezdeka@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=xenomai@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).