diff -Nru rt-tests-1.0/debian/backfire-dkms.dkms rt-tests-1.0/debian/backfire-dkms.dkms --- rt-tests-1.0/debian/backfire-dkms.dkms 2016-06-19 20:25:52.000000000 +0000 +++ rt-tests-1.0/debian/backfire-dkms.dkms 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -PACKAGE_NAME="backfire" -PACKAGE_VERSION="0.84-2" -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 -BUILT_MODULE_NAME[0]=backfire diff -Nru rt-tests-1.0/debian/backfire-dkms.install rt-tests-1.0/debian/backfire-dkms.install --- rt-tests-1.0/debian/backfire-dkms.install 2016-06-19 20:25:52.000000000 +0000 +++ rt-tests-1.0/debian/backfire-dkms.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/src/backfire/* /usr/src/backfire-0.84-2/ diff -Nru rt-tests-1.0/debian/changelog rt-tests-1.0/debian/changelog --- rt-tests-1.0/debian/changelog 2016-06-19 21:46:40.000000000 +0000 +++ rt-tests-1.0/debian/changelog 2017-07-13 12:21:21.000000000 +0000 @@ -1,3 +1,10 @@ +rt-tests (1.0-1ubuntu1~ppa1) artful; urgency=medium + + [ Uwe Kleine-König ] + * drop backfire kernel module package (Closes: #867706) + + -- Marcelo Henrique Cerri Thu, 13 Jul 2017 09:21:21 -0300 + rt-tests (1.0-1) unstable; urgency=medium * new upstream stable release diff -Nru rt-tests-1.0/debian/control rt-tests-1.0/debian/control --- rt-tests-1.0/debian/control 2016-06-19 21:37:10.000000000 +0000 +++ rt-tests-1.0/debian/control 2017-07-13 12:20:43.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Uwe Kleine-König Standards-Version: 3.9.8 -Build-Depends: debhelper (>= 9), libnuma-dev (>= 2.0.3) [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe ppc64 x32], dkms (>= 2.1.0.0) +Build-Depends: debhelper (>= 9), libnuma-dev (>= 2.0.3) [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe ppc64 x32] Vcs-Browser: http://git.pengutronix.de/?p=ukl/rt-tests.git; Vcs-Git: git://git.pengutronix.de/git/ukl/rt-tests.git @@ -19,12 +19,3 @@ functioning of priority-inheritance mutexes. Additionally it contains hackbench, a program to generate work for the scheduler. - -Package: backfire-dkms -Section: kernel -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 -Nru rt-tests-1.0/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch rt-tests-1.0/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch --- rt-tests-1.0/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch 2016-06-19 20:25:52.000000000 +0000 +++ rt-tests-1.0/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Uwe Kleine-König -Subject: backfire: fix build failure for modern kernels - -SPIN_LOCK_UNLOCKED doesn't work any more since v2.6.39-rc1~511^2~11 -(locking: Remove deprecated lock initializers). DEFINE_SPINLOCK is -available since v2.6.14-rc1~223, so it should be ok to depend on that. - is gone since v2.6.39-rc1~467^2. Also -is gone for most architectures since v3.4-rc1~54^2. - -The module builds fine for Debian's 2.6.32 and 3.6 kernels with this -change. - -Signed-off-by: Uwe Kleine-König ---- - src/backfire/backfire.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/src/backfire/backfire.c -+++ b/src/backfire/backfire.c -@@ -24,7 +24,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -32,11 +31,10 @@ - #include - - #include --#include - - #define BACKFIRE_MINOR MISC_DYNAMIC_MINOR - --static spinlock_t backfire_state_lock = SPIN_LOCK_UNLOCKED; -+static DEFINE_SPINLOCK(backfire_state_lock); - static int backfire_open_cnt; /* #times opened */ - static int backfire_open_mode; /* special open modes */ - static struct timeval sendtime; /* when the most recent signal was sent */ diff -Nru rt-tests-1.0/debian/patches/dont-build-backfire.patch rt-tests-1.0/debian/patches/dont-build-backfire.patch --- rt-tests-1.0/debian/patches/dont-build-backfire.patch 1970-01-01 00:00:00.000000000 +0000 +++ rt-tests-1.0/debian/patches/dont-build-backfire.patch 2017-07-13 12:20:43.000000000 +0000 @@ -0,0 +1,46 @@ +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,6 @@ + pmqtest.c \ + ptsematest.c \ + rt-migrate-test.c \ +- sendme.c \ + signaltest.c \ + sigwaittest.c \ + svsematest.c +@@ -78,7 +77,6 @@ + VPATH += src/sigwaittest: + VPATH += src/svsematest: + VPATH += src/pmqtest: +-VPATH += src/backfire: + VPATH += src/lib: + VPATH += src/hackbench: + +@@ -126,9 +124,6 @@ + pmqtest: $(OBJDIR)/pmqtest.o $(OBJDIR)/librttest.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) + +-sendme: $(OBJDIR)/sendme.o $(OBJDIR)/librttest.a +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) +- + pip_stress: $(OBJDIR)/pip_stress.o $(OBJDIR)/librttest.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) + +@@ -164,9 +159,6 @@ + mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4" + mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8" + cp $(TARGETS) "$(DESTDIR)$(bindir)" +- install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" +- install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" + gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" + gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" + gzip -c src/pi_tests/pip_stress.8 >"$(DESTDIR)$(mandir)/man8/pip_stress.8.gz" +@@ -175,7 +167,6 @@ + gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" + gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" + gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" + gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" + gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + diff -Nru rt-tests-1.0/debian/patches/series rt-tests-1.0/debian/patches/series --- rt-tests-1.0/debian/patches/series 2016-06-19 20:45:37.000000000 +0000 +++ rt-tests-1.0/debian/patches/series 2017-07-13 12:20:43.000000000 +0000 @@ -3,5 +3,5 @@ manpage_pip_stress.patch debian_has_recent_glibc.patch fix_comment_about_realtime_group.patch -backfire-fix-build-failure-for-modern-kernels.patch install_manpage_rt-migrate-test.patch +dont-build-backfire.patch diff -Nru rt-tests-1.0/debian/rt-tests.install rt-tests-1.0/debian/rt-tests.install --- rt-tests-1.0/debian/rt-tests.install 2016-06-19 20:25:52.000000000 +0000 +++ rt-tests-1.0/debian/rt-tests.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/bin -usr/sbin -usr/share diff -Nru rt-tests-1.0/debian/rules rt-tests-1.0/debian/rules --- rt-tests-1.0/debian/rules 2016-06-19 20:25:52.000000000 +0000 +++ rt-tests-1.0/debian/rules 2017-07-13 12:20:43.000000000 +0000 @@ -7,7 +7,7 @@ endif DH_SEQUENCE = $@ -DH = dh $(DH_SEQUENCE) --with dkms +DH = dh $(DH_SEQUENCE) build-arch: build-arch-stamp build-indep: