[PATCH 0/2] debian: Move testsuite (smokey) into a separate package

[PATCH 0/2] debian: Move testsuite (smokey) into a separate package

[Florian Bezdeka]

Moving the testsuite into its own package allows to minimize the xenomai
footprint on production systems. Previously the testsuite was part of the 
xenomai-runtime package which had some limitations. For example the gdb
dependency was skipped to keep production systems clean.

With that series applied the xenomai-images build for next/master will
fail. Necessary patches will follow soon and need to be applied in
lockstep with this series.

Note: I'm now using b4 to keep track of patch series versioning, cover
letter creation and sending out patches. Especially the layout/content
of the cover letter is now slightly different. Let me know if there is a
problem somewhere.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
Florian Bezdeka (2):
      lib/boilerplate: Do not remove $(DESTDIR)$(libdir)/xenomai on uninstall
      debian: Extract xenomai tests into separate package (xenomai-testsuite)

 debian/control                   | 18 +++++++++++++++---
 debian/libxenomai-dev.install    |  1 +
 debian/rules                     |  2 --
 debian/xenomai-runtime.install   |  8 ++++++--
 debian/xenomai-testsuite.install |  2 ++
 lib/boilerplate/init/Makefile.am |  2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)
---
base-commit: f06a2e785900ba0d5da170636b2abf2364eacc15
change-id: 20230426-florian-debianization-extract-testsuite-9cc05e26b270

Best regards,
-- 
Florian Bezdeka <florian.bezdeka@siemens.com>

[PATCH 1/2] lib/boilerplate: Do not remove $(DESTDIR)$(libdir)/xenomai on uninstall

[Florian Bezdeka]

$(DESTDIR)$(libdir)/xenomai normally looks like this:

  -rw-r--r--  1 root root 11184 Nov 20  2013 bootstrap.o
  -rw-r--r--  1 root root  9416 Nov 20  2013 bootstrap-pic.o
  drwxr-xr-x  2 root root  4096 Mar 24 19:37 testsuite

We have two files (matching bootstrap*.o) and the testsuite directory
which holds the smokey testsuite. When running "make uninstall" inside
the lib/boilerplate directory the test suite was removed as well.
Limiting the uninstall target to what has been installed during
"make install" fixes this problem.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 lib/boilerplate/init/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/boilerplate/init/Makefile.am b/lib/boilerplate/init/Makefile.am
index b78dd61d1..648168875 100644
--- a/lib/boilerplate/init/Makefile.am
+++ b/lib/boilerplate/init/Makefile.am
@@ -29,4 +29,4 @@ install-data-local:
 	$(INSTALL_DATA) $(call get_pic_object) $(DESTDIR)$(libdir)/xenomai/bootstrap-pic.o || true
 
 uninstall-local:
-	$(RM) -r $(DESTDIR)$(libdir)/xenomai
+	$(RM) $(DESTDIR)$(libdir)/xenomai/bootstrap*.o

-- 
2.39.2

[PATCH 2/2] debian: Extract xenomai tests into separate package (xenomai-testsuite)

[Florian Bezdeka]

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

Re: [PATCH 0/2] debian: Move testsuite (smokey) into a separate package

[Jan Kiszka]

On 27.04.23 16:32, Florian Bezdeka wrote:
> Moving the testsuite into its own package allows to minimize the xenomai
> footprint on production systems. Previously the testsuite was part of the 
> xenomai-runtime package which had some limitations. For example the gdb
> dependency was skipped to keep production systems clean.
> 
> With that series applied the xenomai-images build for next/master will
> fail. Necessary patches will follow soon and need to be applied in
> lockstep with this series.
> 
> Note: I'm now using b4 to keep track of patch series versioning, cover
> letter creation and sending out patches. Especially the layout/content
> of the cover letter is now slightly different. Let me know if there is a
> problem somewhere.
> 
> Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
> ---
> Florian Bezdeka (2):
>       lib/boilerplate: Do not remove $(DESTDIR)$(libdir)/xenomai on uninstall
>       debian: Extract xenomai tests into separate package (xenomai-testsuite)
> 
>  debian/control                   | 18 +++++++++++++++---
>  debian/libxenomai-dev.install    |  1 +
>  debian/rules                     |  2 --
>  debian/xenomai-runtime.install   |  8 ++++++--
>  debian/xenomai-testsuite.install |  2 ++
>  lib/boilerplate/init/Makefile.am |  2 +-
>  6 files changed, 25 insertions(+), 8 deletions(-)
> ---
> base-commit: f06a2e785900ba0d5da170636b2abf2364eacc15
> change-id: 20230426-florian-debianization-extract-testsuite-9cc05e26b270
> 
> Best regards,

Thanks, applied.

Jan
-- 
Siemens AG, Technology
Competence Center Embedded Linux