Merge branch 'debian/buster-5.0' into 'debian/buster'

Making changes to fix deb 10 CI build

See merge request !435

debian/advligorts-dolphin-daemon.install

+support/systemd/rts-dolphin_daemon.service lib/systemd/system
+usr/bin/dolphin_daemon

debian/advligorts-dolphin-proxy-km-dkms.dkms

+PACKAGE_NAME="dolphin-proxy-km"
+PACKAGE_VERSION="#MODULE_VERSION#"
+BUILT_MODULE_NAME="dolphin-proxy-km"
+DEST_MODULE_LOCATION=/extra
+AUTOINSTALL=yes
+POST_BUILD="dkms_install_files
+  ${PACKAGE_NAME}
+  ${PACKAGE_VERSION}
+  ${kernelver}
+  ${arch}
+  ${dkms_tree}
+  Module.symvers
+"
+

debian/advligorts-find-module-symvers.install

+src/epics/util/find_module_symvers usr/bin/

debian/advligorts-logger-dkms.dkms

+PACKAGE_NAME="rts-logger"
+PACKAGE_VERSION="#MODULE_VERSION#"
+BUILT_MODULE_NAME="rts-logger"
+DEST_MODULE_LOCATION=/extra
+AUTOINSTALL=yes
+POST_BUILD="dkms_install_files
+  ${PACKAGE_NAME}
+  ${PACKAGE_VERSION}
+  ${kernelver}
+  ${arch}
+  ${dkms_tree}
+  Module.symvers
+"
+

debian/advligorts-rcg.install

@@ -14,4 +14,7 @@ src/include usr/share/advligorts/src/src
 src/pcie_switch usr/share/advligorts/src/src
 src/shmem usr/share/advligorts/src/src
 src/util usr/share/advligorts/src/src
-src/python/sequence/main.py usr/share/advligorts/src/src/python/sequence
\ No newline at end of file
+src/python/sequence/main.py usr/share/advligorts/src/src/python/sequence
+support/symvers/ usr/share/advligorts/src/support/
+src/dolphin_daemon/include/ usr/share/advligorts/src/src/dolphin_daemon/
+src/librts/ usr/share/advligorts/src/src/

debian/control

@@ -26,6 +26,8 @@ Build-Depends:
  pybind11-dev,
  rapidjson-dev,
  libzstd-dev,
+ python3-pytest,
+ libspdlog-dev,
 Standards-Version: 4.5.0
 Vcs-Git: https://git.ligo.org/cds/advLigoRTS
 Rules-Requires-Root: no
@@ -42,6 +44,32 @@ Description: advLigoRTS common resources metapackage
  Support for other advLigoRTS packages, including creation of the
  'advligorts' user, system config and directories, etc.
 
+Package: advligorts-find-module-symvers
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: advLigoRTS build helper for looking up dkms module symvers
+ advLigoRTS build helper for looking up dkms module symvers
+ .
+ You provide the name of a dkms managed module, and this tool will
+ lookup the Module.symvers paths for your build.
+
+
+Package: advligorts-dolphin-daemon
+Architecture: any
+Depends:
+ advligorts-common,
+ advligorts-dolphin-proxy-km-dkms,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: advLigoRTS dolphin userspace daemon
+ Handles netlink messages from real time modules.
+ .
+ Listens for netlink messages requesting dolphin segment allocations
+ and sends them to the advligorts-dolphin-proxy-km-dkms, returning
+ that modules messages to the original requestor.
+
 Package: advligorts-mbuf-dkms
 Architecture: any
 Depends:
@@ -73,6 +101,26 @@ Description: advLigoRTS realtime module.
  .
  This module provides the hooks needed to run real time LIGO models without requiring a custom built kernel.
 
+Package: advligorts-logger-dkms
+Architecture: any
+Depends:
+ ${misc:Depends},
+Description: advLigoRTS isolated cpu logger module.
+ Core component of advLigoRTS
+ .
+ This module provides logging capabilities to real time isolated kernel modules.
+
+Package: advligorts-dolphin-proxy-km-dkms
+Architecture: any
+Depends:
+ advligorts-find-module-symvers,
+ ${misc:Depends},
+Description: advLigoRTS dolphin node interface module.
+ Core component of advLigoRTS dolphin nodes
+ .
+ This module provides a netlink interface to interact with the Dolphin kernel space interface
+
+
 Package: advligorts-daqd
 Architecture: any
 Depends:
@@ -117,6 +165,7 @@ Depends:
  tcsh,
  git,
  cmake,
+ catch
  ${misc:Depends},
  ${perl:Depends},
 Recommends:

debian/rules

@@ -46,9 +46,32 @@ install-rts-cpu-isolator:
 	install --mode=755 -t debian/advligorts-cpu-isolator-dkms/usr/src/rts-cpu-isolator-$(SVERSION) support/bin/dkms_install_files
 	echo rts-cpu-isolator > debian/advligorts-cpu-isolator-dkms/usr/lib/modules-load.d/rts-cpu-isolator.conf
 
+install-rts-logger:
+	dh_installdirs -padvligorts-logger-dkms usr/src/rts-logger-$(SVERSION)
+	dh_installdirs -padvligorts-logger-dkms usr/src/rts-logger-$(SVERSION)/drv/
+	dh_installdirs -padvligorts-logger-dkms usr/lib/modules-load.d
+	install --mode=644 -t debian/advligorts-logger-dkms/usr/src/rts-logger-$(SVERSION) src/drv/rts-logger/module/*.c
+	install --mode=644 -t debian/advligorts-logger-dkms/usr/src/rts-logger-$(SVERSION)/drv src/include/drv/rts-logger.h
+	install --mode=644 -t debian/advligorts-logger-dkms/usr/src/rts-logger-$(SVERSION) src/drv/rts-logger/module/Makefile
+	install --mode=755 -t debian/advligorts-logger-dkms/usr/src/rts-logger-$(SVERSION) support/bin/dkms_install_files
+	echo rts-logger > debian/advligorts-logger-dkms/usr/lib/modules-load.d/rts-logger.conf
+
+install-advligorts-dolphin-proxy-km:
+	dh_installdirs -padvligorts-dolphin-proxy-km-dkms usr/src/dolphin-proxy-km-$(SVERSION)
+	dh_installdirs -padvligorts-dolphin-proxy-km-dkms usr/src/dolphin-proxy-km-$(SVERSION)/util/
+	dh_installdirs -padvligorts-dolphin-proxy-km-dkms usr/lib/modules-load.d
+	install --mode=644 -t debian/advligorts-dolphin-proxy-km-dkms/usr/src/dolphin-proxy-km-$(SVERSION) src/dolphin_daemon/dolphin_proxy_km/*
+	install --mode=644 -t debian/advligorts-dolphin-proxy-km-dkms/usr/src/dolphin-proxy-km-$(SVERSION) src/dolphin_daemon/include/daemon_messages.h
+	install --mode=644 -t debian/advligorts-dolphin-proxy-km-dkms/usr/src/dolphin-proxy-km-$(SVERSION)/util/ src/include/util/fixed_width_types.h
+	install --mode=644 -t debian/advligorts-dolphin-proxy-km-dkms/usr/src/dolphin-proxy-km-$(SVERSION) support/bin/dkms_install_files
+
+
 install-version:
 	mkdir -p debian/advligorts-rcg/usr/share/advligorts/src/
 	echo $(SVERSION) > debian/advligorts-rcg/usr/share/advligorts/src/rcg-version
+	git rev-parse HEAD > debian/advligorts-rcg/usr/share/advligorts/src/rcg_git_hash.txt
+	git --no-pager diff > debian/advligorts-rcg/usr/share/advligorts/src/rcg_git_diff.txt
+
 
 override_dh_auto_configure:
 	mkdir -p build