add backfire package with dkms supportNotice: this object is not reachable from any branch.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Notice: this object is not reachable from any branch.

9 files changed, 66 insertions, 4 deletions

diff --git a/debian/backfire-dkms.dkms b/debian/backfire-dkms.dkms
new file mode 100644
index 0000000..6255788
--- /dev/null
+++ b/debian/backfire-dkms.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME="backfire"
+PACKAGE_VERSION="0.71-1"
+MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build"
+CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
+DEST_MODULE_LOCATION[0]=/extra
diff --git a/debian/backfire-dkms.install b/debian/backfire-dkms.install
new file mode 100644
index 0000000..b2e34a2
--- /dev/null
+++ b/debian/backfire-dkms.install
@@ -0,0 +1 @@
+/usr/src/backfire/* /usr/src/backfire-0.71-1/
diff --git a/debian/changelog b/debian/changelog
index 23eb380..fcece26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ rt-tests (0.71-1) UNRELEASED; urgency=low
   * drop rename_pip_to_pip_stress (applied upstream)
   * refresh install_hwlatdetect_into_sbindir
   * add powerpcspe to architecture list
+  * add backfire package with dkms support
 
  -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de>  Wed, 26 May 2010 11:43:32 +0200
 
diff --git a/debian/control b/debian/control
index c00d3f9..5eb3c85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.4.15), libnuma-dev (>= 2.0.3) [amd64 i386 ia64 mips mipsel powerpc]
+Build-Depends: debhelper (>= 7.4.15), libnuma-dev (>= 2.0.3) [amd64 i386 ia64 mips mipsel powerpc], dkms (>= 2.1.0.0)
 Vcs-Browser: http://git.pengutronix.de/?p=ukl/rt-tests.git;
 Vcs-Git: git://git.pengutronix.de/git/ukl/rt-tests.git
 
@@ -12,9 +12,18 @@ Architecture: alpha amd64 armel i386 ia64 mips mipsel powerpc powerpcspe s390 sh
 Depends: ${shlibs:Depends}, ${misc:Depends}, python,
  libnuma1 (>= 2.0.3) [amd64 i386 ia64 mips mipsel powerpc]
 Conflicts: xenomai-runtime
+Recommends: backfire-dkms
 Description: Test programs for rt kernels
  rt-tests contains a set of programs that test and measure various components
  of real-time kernel behavior, such as timer latency, signal latency and the
  functioning of priority-inheritance mutexes.
  Additionally it contains hackbench, a program to generate work for the
  scheduler.
+
+Package: backfire-dkms
+Architecture: all
+Depends: ${misc:Depends},
+Replaces: rt-tests (<= 0.66-2)
+Description: kernel module for signal benchmarking (DKMS)
+ backfire is a driver used by sendme(8) (contained in the rt-tests package) to
+ benchmark kernel to userspace signal generation.
diff --git a/debian/patches/debian_adapt_errormsg_on_failure_to_open_device b/debian/patches/debian_adapt_errormsg_on_failure_to_open_device
new file mode 100644
index 0000000..62e0f70
--- /dev/null
+++ b/debian/patches/debian_adapt_errormsg_on_failure_to_open_device
@@ -0,0 +1,25 @@
+sendme: Adapt error message for Debian
+
+For Debian users installing the backfire-dkms package should be enough to get
+the kernel module.
+
+Forwarded: not-needed
+---
+ src/backfire/sendme.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/backfire/sendme.c
++++ b/src/backfire/sendme.c
+@@ -212,9 +212,9 @@
+ 				"try 'modprobe backfire'\n"
+ 				"If the module backfire can't be loaded, "
+ 				"it may need to be built first.\n"
+-				"Execute 'cd src/backfire; make' in the "
+-				"rt-tests directory (requires rt-tests\n"
+-				"sources and kernel-devel package).\n");
++				"Try installing the backfire-dkms package "
++				"and kernel headers corresponding to your "
++				"kernel.\n");
+ 		return 1;
+ 	}
+ 	fl.l_type = F_WRLCK;
diff --git a/debian/patches/install_backfire_Makefile b/debian/patches/install_backfire_Makefile
new file mode 100644
index 0000000..d705bfb
--- /dev/null
+++ b/debian/patches/install_backfire_Makefile
@@ -0,0 +1,14 @@
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
+@@ -116,6 +116,7 @@
+ 	install -m 755 src/hwlatdetect/hwlatdetect.py "$(DESTDIR)$(sbindir)/hwlatdetect"
+ 	mkdir -p "$(DESTDIR)$(srcdir)/backfire"
+ 	install -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
++	install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
+ 	gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
+ 	gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
+ 	gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
diff --git a/debian/patches/series b/debian/patches/series
index 9e91931..d0dc06e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 install_hwlatdetect_into_sbindir
 modernize_backfire_Makefile
+install_backfire_Makefile
+debian_adapt_errormsg_on_failure_to_open_device
diff --git a/debian/rt-tests.install b/debian/rt-tests.install
new file mode 100644
index 0000000..e1db48a
--- /dev/null
+++ b/debian/rt-tests.install
@@ -0,0 +1,3 @@
+usr/bin
+usr/sbin
+usr/share
diff --git a/debian/rules b/debian/rules
index 1da1423..5813fd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,19 +6,21 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH), amd64 i386 ia64 mips mipsel powerpc))
 export NUMA=1
 endif
 
+DH = dh --with dkms
+
 build: build-stamp
 install: build install-stamp
 
 build-stamp install-stamp:
-	dh ${@:-stamp=}
+	$(DH) ${@:-stamp=}
 	touch $@
 
 binary-arch binary-indep: install
-	dh $@
+	$(DH) $@
 
 binary: binary-arch binary-indep
 
 clean:
-	dh $@
+	$(DH) $@
 
 .PHONY: build clean install binary-indep binary-arch binary