cmake project now accepts SPC_SOURCE environment variable to build MI40xx binary kernel driver
This commit is contained in:
parent
9836f0b073
commit
4a308c6ddf
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,11 +1,12 @@
|
|||||||
damaris (0.16~svn803) unstable; urgency=low
|
damaris (0.16+nmu803) unstable; urgency=low
|
||||||
|
|
||||||
* transition to cmake and new debhelper
|
* transition to cmake and new debhelper
|
||||||
* Fixed: pulseblaster WAIT opcode is ignored if preceeding state is shorter than 120ns.
|
* Fixed: pulseblaster WAIT opcode is ignored if
|
||||||
|
preceding state is shorter than 120ns.
|
||||||
* pulseblaster_only backend
|
* pulseblaster_only backend
|
||||||
* preliminary AD5791 driver
|
* preliminary AD5791 driver
|
||||||
|
|
||||||
-- Markus Rosenstihl <markusro@track.fkp.physik.tu-darmstadt.de> Wed, 25 Jan 2017 17:35:05 +0100
|
-- Markus Rosenstihl <markus.rosenstihl@physik.tu-darmstadt.de> Wed, 25 Jan 2017 17:35:05 +0100
|
||||||
|
|
||||||
damaris (0.15) UNRELEASED; urgency=low
|
damaris (0.15) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
2
debian/compat
vendored
2
debian/compat
vendored
@ -1 +1 @@
|
|||||||
9
|
7
|
||||||
|
14
debian/control
vendored
14
debian/control
vendored
@ -3,28 +3,30 @@ Section: science
|
|||||||
Priority: optional
|
Priority: optional
|
||||||
Standards-Version: 3.9.6
|
Standards-Version: 3.9.6
|
||||||
Maintainer: Markus Rosenstihl <Markus.Rosenstihl@physik.tu-darmstadt.de>
|
Maintainer: Markus Rosenstihl <Markus.Rosenstihl@physik.tu-darmstadt.de>
|
||||||
Uploaders: Markus Rosenstihl <Markus.Rosenstihl@physik.tu-darmstadt.de>
|
Build-Depends: debhelper (>=7),
|
||||||
Build-Depends: debhelper,
|
|
||||||
libxerces-c3-dev|libxerces-c-dev,
|
libxerces-c3-dev|libxerces-c-dev,
|
||||||
libexpat-dev|libexpat1-dev,
|
libexpat-dev|libexpat1-dev,
|
||||||
unzip,
|
unzip,
|
||||||
libglib2.0-dev,
|
libglib2.0-dev,
|
||||||
linux-headers|linux-headers-amd64,
|
linux-headers|linux-headers-amd64,
|
||||||
cmake,
|
cmake,
|
||||||
|
kmod
|
||||||
|
|
||||||
Package: damaris-backends
|
Package: damaris-backends
|
||||||
Architecture: i386 amd64
|
Architecture: i386 amd64
|
||||||
Depends: ${shlibs:Depends}, bash (>=4.2), kmod, coreutils (>=8.13), libxerces-c3.1|libxerces-c-dev, udev, libglib2.0-0
|
Depends: ${misc:Depends},${shlibs:Depends}, bash (>=4.2), kmod, coreutils (>=8.13), libxerces-c3.1|libxerces-c-dev, udev, libglib2.0-0
|
||||||
Recommends: python-damaris|damaris-frontend, damaris-modules
|
Recommends: python-damaris|damaris-frontend, damaris-modules
|
||||||
Description: DAMARIS backends package
|
Description: DAMARIS backends package
|
||||||
This is the DAMARIS backends package. It contains machine definitions (the backends) for running DAMARIS experiments.
|
This is the DAMARIS backends package. It contains machine definitions
|
||||||
|
(the backends) for running DAMARIS experiments.
|
||||||
|
|
||||||
Package: damaris-modules
|
Package: damaris-modules
|
||||||
Architecture: i386 amd64
|
Architecture: i386 amd64
|
||||||
Recommends: damaris-backends
|
Recommends: damaris-backends
|
||||||
Depends: ${linux-image:Depends}
|
Depends: ${misc:Depends}, kmod
|
||||||
Replaces: damaris-backends (<= 0.13-0.5)
|
Replaces: damaris-backends (<= 0.13-0.5)
|
||||||
Description: Kernel modules for DAMARIS hardware
|
Description: Kernel modules for DAMARIS hardware
|
||||||
This are kernel modules for DAMARIS compatible hardware. Currently there are two binary drivers:
|
This are kernel modules for DAMARIS compatible hardware.
|
||||||
|
Currently there are two binary drivers:
|
||||||
one for SpinCore PulseBlaster and Spectrum MI40xx ADC cards.
|
one for SpinCore PulseBlaster and Spectrum MI40xx ADC cards.
|
||||||
|
|
||||||
|
1
debian/damaris-backends.debhelper.log
vendored
1
debian/damaris-backends.debhelper.log
vendored
@ -18,6 +18,7 @@ dh_installdebconf
|
|||||||
dh_installemacsen
|
dh_installemacsen
|
||||||
dh_installifupdown
|
dh_installifupdown
|
||||||
dh_installinfo
|
dh_installinfo
|
||||||
|
dh_pysupport
|
||||||
dh_installinit
|
dh_installinit
|
||||||
dh_installmenu
|
dh_installmenu
|
||||||
dh_installmime
|
dh_installmime
|
||||||
|
14
debian/damaris-backends.postinst
vendored
14
debian/damaris-backends.postinst
vendored
@ -1,4 +1,4 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh -e
|
||||||
|
|
||||||
if grep nmr /etc/group >/dev/null; then
|
if grep nmr /etc/group >/dev/null; then
|
||||||
echo "group nmr already exists" ;
|
echo "group nmr already exists" ;
|
||||||
@ -13,15 +13,3 @@ find /usr/lib/damaris/backends -type f \
|
|||||||
-exec chmod u+s,o= {} \;
|
-exec chmod u+s,o= {} \;
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
|
||||||
if [ "$1" = "configure" -a -n "$2" ]; then
|
|
||||||
comparableversion=`echo "$2"|sed 's/[\.-]/ /g'|xargs printf "%03d%03d%03d"`
|
|
||||||
if [ "000011000" -gt $comparableversion ]; then
|
|
||||||
# transition to version with udev
|
|
||||||
if [ \! -e /etc/udev/rules.d/z60_damaris-backends.rules ]; then
|
|
||||||
# check whether the link/script was done when updating from 0.11 to newer version
|
|
||||||
ln -s ../damaris-backends.rules /etc/udev/rules.d/z60_damaris-backends.rules
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
2
debian/damaris-backends.postrm
vendored
2
debian/damaris-backends.postrm
vendored
@ -1,4 +1,4 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh -e
|
||||||
|
|
||||||
if test x$1 = xpurge; then
|
if test x$1 = xpurge; then
|
||||||
if grep nmr /etc/group >/dev/null; then
|
if grep nmr /etc/group >/dev/null; then
|
||||||
|
1
debian/damaris-modules.debhelper.log
vendored
1
debian/damaris-modules.debhelper.log
vendored
@ -18,6 +18,7 @@ dh_installdebconf
|
|||||||
dh_installemacsen
|
dh_installemacsen
|
||||||
dh_installifupdown
|
dh_installifupdown
|
||||||
dh_installinfo
|
dh_installinfo
|
||||||
|
dh_pysupport
|
||||||
dh_installinit
|
dh_installinit
|
||||||
dh_installmenu
|
dh_installmenu
|
||||||
dh_installmime
|
dh_installmime
|
||||||
|
9
debian/damaris-modules.init
vendored
9
debian/damaris-modules.init
vendored
@ -1,8 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
### BEGIN INIT INFO
|
### BEGIN INIT INFO
|
||||||
# Provides: damaris-backends
|
# Provides: damaris-backends
|
||||||
# Required-Start: $syslog
|
# Required-Start: $syslog $remote_fs
|
||||||
# Required-Stop: $syslog
|
# Required-Stop: $syslog $remote_fs
|
||||||
# Default-Start: 2 3 4 5
|
# Default-Start: 2 3 4 5
|
||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Short-Description: Startup script to load nmr hardware drivers for use with damaris backends
|
# Short-Description: Startup script to load nmr hardware drivers for use with damaris backends
|
||||||
@ -137,6 +137,7 @@ status () {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
start
|
start
|
||||||
@ -148,6 +149,10 @@ case "$1" in
|
|||||||
stop
|
stop
|
||||||
start
|
start
|
||||||
;;
|
;;
|
||||||
|
force-reload)
|
||||||
|
stop
|
||||||
|
start
|
||||||
|
;;
|
||||||
status)
|
status)
|
||||||
status
|
status
|
||||||
;;
|
;;
|
||||||
|
4
debian/damaris-modules.postinst
vendored
4
debian/damaris-modules.postinst
vendored
@ -1,8 +1,8 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh -e
|
||||||
if grep -q nmr /etc/group; then
|
if grep -q nmr /etc/group; then
|
||||||
|
#DEBHELPER#
|
||||||
echo "group nmr already exists" ;
|
echo "group nmr already exists" ;
|
||||||
else
|
else
|
||||||
echo "creating group nmr" ;
|
echo "creating group nmr" ;
|
||||||
groupadd nmr || echo "failed!"
|
groupadd nmr || echo "failed!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
4
debian/files
vendored
4
debian/files
vendored
@ -1,2 +1,2 @@
|
|||||||
damaris-backends_0.16~svn803_amd64.deb science optional
|
damaris-backends_0.16+nmu803_amd64.deb science optional
|
||||||
damaris-modules_0.16~svn803_amd64.deb science optional
|
damaris-modules_0.16+nmu803_amd64.deb science optional
|
||||||
|
24
debian/rules
vendored
24
debian/rules
vendored
@ -2,13 +2,27 @@
|
|||||||
|
|
||||||
# Achim Gaedke
|
# Achim Gaedke
|
||||||
# May 2007
|
# May 2007
|
||||||
|
# See debhelper(7) (uncomment to enable)
|
||||||
# Uncomment this to turn on verbose mode.
|
# output every command that modifies files on the build system.
|
||||||
DH_VERBOSE=1
|
#DH_VERBOSE = 1
|
||||||
export DH_OPTIONS=-v
|
#
|
||||||
|
# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
|
||||||
DPKG_EXPORT_BUILDFLAGS = 1
|
DPKG_EXPORT_BUILDFLAGS = 1
|
||||||
include /usr/share/dpkg/default.mk
|
include /usr/share/dpkg/default.mk
|
||||||
|
#
|
||||||
|
# see FEATURE AREAS in dpkg-buildflags(1)
|
||||||
|
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||||
|
#
|
||||||
|
# see ENVIRONMENT in dpkg-buildflags(1)
|
||||||
|
# package maintainers to append CFLAGS
|
||||||
|
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
|
||||||
|
# package maintainers to append LDFLAGS
|
||||||
|
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
export DH_OPTIONS=-v
|
||||||
|
|
||||||
BACKENDSBASE=$(shell pwd)/debian/damaris-backends
|
BACKENDSBASE=$(shell pwd)/debian/damaris-backends
|
||||||
BACKENDSMACHINES = \
|
BACKENDSMACHINES = \
|
||||||
|
2
debian/source/lintian-overrides
vendored
Normal file
2
debian/source/lintian-overrides
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
damaris source: source-is-missing drivers/SpinCore-PulseBlaster/pulseblaster.ko
|
||||||
|
damaris source: source-is-missing drivers/Spectrum-MI40xxSeries/linux/src_all/micx_drv/spc_smp.ko
|
@ -21,7 +21,13 @@ add_custom_command(OUTPUT ${SPC_HEADERS}
|
|||||||
# the actual kernel source file is in the src_all/micx_drv subfolder
|
# the actual kernel source file is in the src_all/micx_drv subfolder
|
||||||
# If the "linux" folder exists the driver will be build
|
# If the "linux" folder exists the driver will be build
|
||||||
|
|
||||||
|
if(DEFINED ENV{SPC_SOURCE})
|
||||||
|
message("SPC_SOURCE environment variable set")
|
||||||
|
set(SPC_SRC $ENV{SPC_SOURCE})
|
||||||
|
else()
|
||||||
|
message("Spectrum driver source path not defined in envirnoment variable SPC_SOURCE")
|
||||||
set(SPC_SRC ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv)
|
set(SPC_SRC ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv)
|
||||||
|
endif()
|
||||||
set(DRIVER_FILE ${SPC_SRC}/spc_smp.ko )
|
set(DRIVER_FILE ${SPC_SRC}/spc_smp.ko )
|
||||||
set(KERNEL_DIR "/lib/modules/${CMAKE_SYSTEM_VERSION}/build" )
|
set(KERNEL_DIR "/lib/modules/${CMAKE_SYSTEM_VERSION}/build" )
|
||||||
set(KBUILD_CMD ${CMAKE_MAKE_PROGRAM}
|
set(KBUILD_CMD ${CMAKE_MAKE_PROGRAM}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
### BEGIN INIT INFO
|
### BEGIN INIT INFO
|
||||||
# Provides: damaris-backends
|
# Provides: damaris-backends
|
||||||
# Required-Start: $syslog
|
# Required-Start: $syslog $remote_fs
|
||||||
# Required-Stop: $syslog
|
# Required-Stop: $syslog $remote_fs
|
||||||
# Default-Start: 2 3 4 5
|
# Default-Start: 2 3 4 5
|
||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Short-Description: Startup script to load nmr hardware drivers for use with damaris backends
|
# Short-Description: Startup script to load nmr hardware drivers for use with damaris backends
|
||||||
@ -136,6 +136,12 @@ status () {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
force-reload() {
|
||||||
|
stop
|
||||||
|
start
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
start
|
start
|
||||||
@ -150,8 +156,11 @@ case "$1" in
|
|||||||
status)
|
status)
|
||||||
status
|
status
|
||||||
;;
|
;;
|
||||||
|
force-reload)
|
||||||
|
force-reload
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
printf "Usage: %s {start|stop|restart|status}\n" "$0"
|
printf "Usage: %s {start|stop|restart|force-reload|status}\n" "$0"
|
||||||
RETVAL=1
|
RETVAL=1
|
||||||
esac
|
esac
|
||||||
exit $RETVAL
|
exit $RETVAL
|
||||||
|
Loading…
Reference in New Issue
Block a user