Package: dkms
Version: 2.2.1.0+git20160527-1
Followup-For: Bug #830670
Well I wasn't thorough and forgot a similar change in
/etc/dkms/template-dkms-mkbmdeb/debian/rules and the resulting module
was empty
here are the updated patches for version 2.2.1.0+git20160527-1, sorry.
diff -urN dkms-2.2.1.0+git20160527.orig/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch dkms-2.2.1.0+git20160527/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
--- dkms-2.2.1.0+git20160527.orig/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch 2016-08-23 08:24:29.000000000 +0200
+++ dkms-2.2.1.0+git20160527/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch 2016-10-09 07:40:52.278505224 +0200
@@ -87,7 +87,7 @@
+ die 7 $"There was a problem creating your ${create_type}."
+ echo $""
+ echo $"DKMS: mk${create_type} completed."
-+ invoke_command "mv '$temp_dir/${debian_package}-dkms-bin_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
++ invoke_command "mv '$temp_dir/${debian_package}-modules-${kernelver}_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
;;
esac
popd > /dev/null 2>&1
@@ -187,7 +187,7 @@
===================================================================
--- /dev/null
+++ dkms/template-dkms-mkbmdeb/debian/control
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
+Source: DEBIAN_PACKAGE-dkms-bin
+Section: misc
+Priority: optional
@@ -195,9 +195,10 @@
+Build-Depends: debhelper (>= 7), dkms
+Standards-Version: 3.8.1
+
-+Package: DEBIAN_PACKAGE-dkms-bin
++Package: DEBIAN_PACKAGE-modules-KERNEL_VERSION
+Architecture: DEBIAN_BUILD_ARCH
+Depends: ${misc:Depends}, linux-image-KERNEL_VERSION
++Provides: DEBIAN_PACKAGE-modules
+Description: DEBIAN_PACKAGE binary drivers for linux-image-KERNEL_VERSION
+ This package contains DEBIAN_PACKAGE drivers for the KERNEL_VERSION Linux kernel,
+ built from DEBIAN_PACKAGE-dkms for the DEBIAN_BUILD_ARCH architecture.
@@ -212,7 +213,7 @@
===================================================================
--- /dev/null
+++ dkms/template-dkms-mkbmdeb/debian/rules
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
@@ -222,6 +223,7 @@
+DEB_NAME=DEBIAN_PACKAGE
+NAME=MODULE_NAME
+VERSION=MODULE_VERSION
++KVER=KERNEL_VERSION
+
+configure: configure-stamp
+configure-stamp:
@@ -248,7 +250,7 @@
+ dh_testroot
+ dh_prep
+ dh_installdirs
-+ $(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-dkms-bin NAME=$(NAME) VERSION=$(VERSION) install
++ $(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-modules-$(KVER) NAME=$(NAME) VERSION=$(VERSION) install
+
+binary-arch: build install
+
diff -urN /etc/dkms.orig/template-dkms-mkbmdeb/debian/control /etc/dkms/template-dkms-mkbmdeb/debian/control
--- /etc/dkms.orig/template-dkms-mkbmdeb/debian/control 2016-10-09 05:14:35.480762368 +0200
+++ /etc/dkms/template-dkms-mkbmdeb/debian/control 2016-10-09 07:35:06.156543566 +0200
@@ -5,9 +5,10 @@
Build-Depends: debhelper (>= 7), dkms
Standards-Version: 3.8.1
-Package: DEBIAN_PACKAGE-dkms-bin
+Package: DEBIAN_PACKAGE-modules-KERNEL_VERSION
Architecture: DEBIAN_BUILD_ARCH
Depends: ${misc:Depends}, linux-image-KERNEL_VERSION
+Provides: DEBIAN_PACKAGE-modules
Description: DEBIAN_PACKAGE binary drivers for linux-image-KERNEL_VERSION
This package contains DEBIAN_PACKAGE drivers for the KERNEL_VERSION Linux kernel,
built from DEBIAN_PACKAGE-dkms for the DEBIAN_BUILD_ARCH architecture.
diff -urN /etc/dkms.orig/template-dkms-mkbmdeb/debian/rules /etc/dkms/template-dkms-mkbmdeb/debian/rules
--- /etc/dkms.orig/template-dkms-mkbmdeb/debian/rules 2016-07-06 01:12:45.000000000 +0200
+++ /etc/dkms/template-dkms-mkbmdeb/debian/rules 2016-10-09 07:35:53.644812707 +0200
@@ -7,6 +7,7 @@
DEB_NAME=DEBIAN_PACKAGE
NAME=MODULE_NAME
VERSION=MODULE_VERSION
+KVER=KERNEL_VERSION
configure: configure-stamp
configure-stamp:
@@ -33,7 +34,7 @@
dh_testroot
dh_prep
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-dkms-bin NAME=$(NAME) VERSION=$(VERSION) install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-modules-$(KVER) NAME=$(NAME) VERSION=$(VERSION) install
binary-arch: build install
--- /usr/sbin/dkms.orig 2016-08-23 08:24:38.000000000 +0200
+++ /usr/sbin/dkms 2016-08-23 08:24:38.000000000 +0200
@@ -3119,7 +3119,7 @@
die 7 $"There was a problem creating your ${create_type}."
echo $""
echo $"DKMS: mk${create_type} completed."
- invoke_command "mv '$temp_dir/${debian_package}-dkms-bin_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
+ invoke_command "mv '$temp_dir/${debian_package}-modules-${kernelver}_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
;;
esac
popd > /dev/null 2>&1
