[Pkg-dkms-commits] [dkms] 02/03: Update patches

Aron Xu aron at debian.org
Tue Aug 23 09:21:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

aron pushed a commit to branch master
in repository dkms.

commit 3fd058785a94a4d7eadf34c6cd444d82a1cdcfb9
Author: Aron Xu <aron at debian.org>
Date:   Tue Aug 23 14:16:04 2016 +0800

    Update patches
---
 .../{0003-688904.patch => 0001-688904.patch}       |  18 +--
 ...do-not-fail-if-lib-modules-does-not-exist.patch |  21 ---
 debian/patches/0002-757758.patch                   |  45 +++++++
 ...directory-where-the-module-was-installed-.patch |  24 ----
 ...ch => 0003-Do-not-ignore-kernelsourcedir.patch} |  10 +-
 debian/patches/0004-757758.patch                   |  36 -----
 ...ort-for-lean-binary-package-with-only-th.patch} | 147 ++++++++++----------
 ..._have_one_kernel_for_non-zero_return_code.patch |  33 -----
 debian/patches/0006-690865.patch                   |  21 ---
 ...OST_BUILD-to-the-dkms_conf_variables-list.patch |  23 ----
 ...08-Add-BUILD_DEPENDS-configuration-option.patch | 150 ---------------------
 debian/patches/0009-apport-write-binary.patch      |  19 ---
 debian/patches/0010-parallell-build.patch          | 112 ---------------
 debian/patches/0011-690866-helpmsg.patch           |  36 -----
 .../patches/0013-Port-apport-hook-to-python3.patch |  57 --------
 debian/patches/series                              |  18 +--
 16 files changed, 134 insertions(+), 636 deletions(-)

diff --git a/debian/patches/0003-688904.patch b/debian/patches/0001-688904.patch
similarity index 71%
rename from debian/patches/0003-688904.patch
rename to debian/patches/0001-688904.patch
index 7ec3e11..8b0f69a 100644
--- a/debian/patches/0003-688904.patch
+++ b/debian/patches/0001-688904.patch
@@ -7,11 +7,11 @@ Subject: 688904
  dkms | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/dkms b/dkms
-index c96cd8f..428943a 100644
---- a/dkms
-+++ b/dkms
-@@ -19,6 +19,7 @@
+Index: dkms/dkms
+===================================================================
+--- dkms.orig/dkms
++++ dkms/dkms
+@@ -20,6 +20,7 @@
  #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
  
@@ -19,12 +19,12 @@ index c96cd8f..428943a 100644
  
  # All of the variables we will accept from dkms.conf.
  # Does not include directives
-@@ -1827,7 +1828,7 @@ module_status_built_extra() (
+@@ -1941,7 +1942,7 @@ module_status_built_extra() (
  # we do not get word splitting where it would be inconvienent.
  module_status_built() {
      local ret=1 directory ka k a state oifs="$IFS" IFS=''
 -    for directory in "$dkms_tree/$1/$2/"${3:-[0-9].*}/${4:-*}; do
 +    for directory in "$dkms_tree/$1/$2/"${3:-+([0-9]).*}/${4:-*}; do
- 	IFS="$oifs"
- 	ka="${directory#$dkms_tree/$1/$2/}"
- 	k="${ka%/*}"
+         IFS="$oifs"
+         ka="${directory#$dkms_tree/$1/$2/}"
+         k="${ka%/*}"
diff --git a/debian/patches/0001-do-not-fail-if-lib-modules-does-not-exist.patch b/debian/patches/0001-do-not-fail-if-lib-modules-does-not-exist.patch
deleted file mode 100644
index b1b5763..0000000
--- a/debian/patches/0001-do-not-fail-if-lib-modules-does-not-exist.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Andreas Beckmann <debian at abeckmann.de>
-Date: Wed, 6 Jul 2016 05:24:47 +0800
-Subject: do not fail if /lib/modules does not exist
-
----
- dkms_common.postinst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dkms_common.postinst b/dkms_common.postinst
-index d8cf3a7..0c8cfc1 100644
---- a/dkms_common.postinst
-+++ b/dkms_common.postinst
-@@ -146,7 +146,7 @@ if [ -z "$NAME" ] || [ -z "$VERSION" ]; then
-     exit 1
- fi
- 
--KERNELS=$(ls /lib/modules/)
-+KERNELS=$(ls /lib/modules/ 2>/dev/null || true)
- CURRENT_KERNEL=$(uname -r)
- 
- #We never want to keep an older version side by side to prevent conflicts
diff --git a/debian/patches/0002-757758.patch b/debian/patches/0002-757758.patch
new file mode 100644
index 0000000..5c9514d
--- /dev/null
+++ b/debian/patches/0002-757758.patch
@@ -0,0 +1,45 @@
+From: Dynamic Kernel Modules Support Team
+ <pkg-dkms-maint at lists.alioth.debian.org>
+Date: Wed, 6 Jul 2016 05:24:47 +0800
+Subject: 757758
+
+---
+ dkms | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+Index: dkms/dkms
+===================================================================
+--- dkms.orig/dkms
++++ dkms/dkms
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ #
+ #  Dynamic Kernel Module Support (DKMS) <dkms-devel at dell.com>
+-#  Copyright (C) 2003-2008 Dell, Inc.
++#  Copyright (C) 2004-2008 Dell, Inc.
+ #  by Gary Lerhaupt, Matt Domsch, & Mario Limonciello
+ #  Copyright (C) 2012 by Darik Horn <dajhorn at vanadac.com>
+ #
+@@ -829,16 +829,17 @@ moduleconfig_update_obsoletes()
+     # Do all the changes at once, record the diffs for posterity
+     for file in "$@"; do
+         [[ $file && -w $file ]] || continue
++	_tmpf="$temp_dir_name/${file##*/}.new"
+         if [[ $file = /etc/sysconfig/kernel ]]; then
+-            sed "${sa_sck_o[*]}" "$file" > "$temp_dir_name/${file##*/}.new"
++	    [ -z "${sa_sck_o[@]}" ] || sed "${sa_sck_o[@]}" "$file" > "$_tmpf"
+         else
+-            sed "${sa_mc_o[*]}" "$file" > "$temp_dir_name/${file##*/}.new"
++	    [ -z "${sa_mc_o[@]}" ] || sed "${sa_mc_o[@]}" "$file" > "$_tmpf"
+         fi
+-        if ! mod_diff=$(diff -u "$temp_dir_name/${file##*/}.new" "$file"); then
++	if [ -f "$_tmpf" ] && ! mod_diff=$(diff -u "$_tmpf" "$file"); then
+             echo $"$file updated to replace obsoleted module references:"
+             echo "$mod_diff"
+-            cp -fp "$temp_dir_name/${file##*/}.new" "$file"
+-            rm -f "$temp_dir_name/${file##*/}.new"
++	    cp -fp "$_tmpf" "$file"
++	    rm -f "$_tmpf"
+         fi
+     done
+ }
diff --git a/debian/patches/0002-remove-the-directory-where-the-module-was-installed-.patch b/debian/patches/0002-remove-the-directory-where-the-module-was-installed-.patch
deleted file mode 100644
index 3f3eaed..0000000
--- a/debian/patches/0002-remove-the-directory-where-the-module-was-installed-.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Andreas Beckmann <debian at abeckmann.de>
-Date: Wed, 6 Jul 2016 05:24:47 +0800
-Subject: remove the directory where the module was installed after removing a
- module try to remove the path (below /lib/modules/KVERS) were the module was
- installed to cleanup any remaining empty directories
-
----
- dkms | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dkms b/dkms
-index 042acc0..c96cd8f 100644
---- a/dkms
-+++ b/dkms
-@@ -1579,6 +1579,9 @@ do_uninstall()
- 	    echo $" - Uninstallation"
- 	    echo $"   - Deleting from: $install_tree/$1${real_dest_module_location}/"
- 	    rm -f "$install_tree/$1${real_dest_module_location}/${dest_module_name[$count]}$module_suffix"
-+	    dir_to_remove="${real_dest_module_location#/}"
-+	    while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do dir_to_remove="${dir_to_remove#/}" ; done
-+	    (cd "$install_tree/$1" && rmdir --parents --ignore-fail-on-non-empty "${dir_to_remove}" || true)
- 	    echo $" - Original module"
- 	    if [[ -e $dkms_tree/$module/original_module/$1/$2/${dest_module_name[$count]}$module_suffix ]]; then
- 		case "$running_distribution" in
diff --git a/debian/patches/0012-Do-not-ignore-kernelsourcedir.patch b/debian/patches/0003-Do-not-ignore-kernelsourcedir.patch
similarity index 74%
rename from debian/patches/0012-Do-not-ignore-kernelsourcedir.patch
rename to debian/patches/0003-Do-not-ignore-kernelsourcedir.patch
index ae866ae..0d80956 100644
--- a/debian/patches/0012-Do-not-ignore-kernelsourcedir.patch
+++ b/debian/patches/0003-Do-not-ignore-kernelsourcedir.patch
@@ -7,11 +7,11 @@ Subject: Do not ignore --kernelsourcedir
  dkms | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/dkms b/dkms
-index 3b82975..bde0e27 100644
---- a/dkms
-+++ b/dkms
-@@ -48,6 +48,9 @@ _get_kernel_dir() {
+Index: dkms/dkms
+===================================================================
+--- dkms.orig/dkms
++++ dkms/dkms
+@@ -49,6 +49,9 @@ _get_kernel_dir() {
         Linux)          DIR="/lib/modules/$KVER/build" ;;
         GNU/kFreeBSD)   DIR="/usr/src/kfreebsd-headers-$KVER/sys" ;;
      esac
diff --git a/debian/patches/0004-757758.patch b/debian/patches/0004-757758.patch
deleted file mode 100644
index 413e7a8..0000000
--- a/debian/patches/0004-757758.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Dynamic Kernel Modules Support Team
- <pkg-dkms-maint at lists.alioth.debian.org>
-Date: Wed, 6 Jul 2016 05:24:47 +0800
-Subject: 757758
-
----
- dkms | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/dkms b/dkms
-index 428943a..9d24bd9 100644
---- a/dkms
-+++ b/dkms
-@@ -761,16 +761,17 @@ moduleconfig_update_obsoletes()
-     # do all the changes at once, record the diffs for posterity
-     for file in "$@"; do
- 	[[ $file && -w $file ]] || continue
-+	_tmpf="$temp_dir_name/${file##*/}.new"
- 	if [[ $file = /etc/sysconfig/kernel ]]; then
--	    sed "${sa_sck_o[@]}" "$file" > "$temp_dir_name/${file##*/}.new"
-+	    [ -z "${sa_sck_o[@]}" ] || sed "${sa_sck_o[@]}" "$file" > "$_tmpf"
- 	else
--	    sed "${sa_mc_o[@]}" "$file" > "$temp_dir_name/${file##*/}.new"
-+	    [ -z "${sa_mc_o[@]}" ] || sed "${sa_mc_o[@]}" "$file" > "$_tmpf"
- 	fi
--	if ! mod_diff=$(diff -u "$temp_dir_name/${file##*/}.new" "$file"); then
-+	if [ -f "$_tmpf" ] && ! mod_diff=$(diff -u "$_tmpf" "$file"); then
- 	    echo $"$file updated to replace obsoleted module references:"
- 	    echo "$mod_diff"
--	    cp -fp "$temp_dir_name/${file##*/}.new" "$file"
--	    rm -f "$temp_dir_name/${file##*/}.new"
-+	    cp -fp "$_tmpf" "$file"
-+	    rm -f "$_tmpf"
- 	fi
-     done
- }
diff --git a/debian/patches/0014-mkbmdeb-support-for-lean-binary-package-with-only-th.patch b/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
similarity index 68%
rename from debian/patches/0014-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
rename to debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
index 6dca23d..3e6b9ba 100644
--- a/debian/patches/0014-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
+++ b/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
@@ -10,7 +10,7 @@ Subject: mkbmdeb: support for lean binary package with only the built modules
 Bug-Debian: http://bugs.debian.org/554843
 ---
  Makefile                                   |  4 +++
- dkms                                       | 19 ++++++++--
+ dkms                                       | 21 +++++++++--
  dkms.8                                     | 12 +++++++
  template-dkms-mkbmdeb/Makefile             | 18 ++++++++++
  template-dkms-mkbmdeb/debian/README.Debian |  5 +++
@@ -19,7 +19,7 @@ Bug-Debian: http://bugs.debian.org/554843
  template-dkms-mkbmdeb/debian/control       | 13 +++++++
  template-dkms-mkbmdeb/debian/copyright     |  2 ++
  template-dkms-mkbmdeb/debian/rules         | 57 ++++++++++++++++++++++++++++++
- 10 files changed, 134 insertions(+), 3 deletions(-)
+ 10 files changed, 136 insertions(+), 3 deletions(-)
  create mode 100644 template-dkms-mkbmdeb/Makefile
  create mode 100644 template-dkms-mkbmdeb/debian/README.Debian
  create mode 100644 template-dkms-mkbmdeb/debian/changelog
@@ -28,11 +28,11 @@ Bug-Debian: http://bugs.debian.org/554843
  create mode 100644 template-dkms-mkbmdeb/debian/copyright
  create mode 100644 template-dkms-mkbmdeb/debian/rules
 
-diff --git a/Makefile b/Makefile
-index c64332e..2dc9cf8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -81,6 +81,10 @@ install-debian: install install-doc
+Index: dkms/Makefile
+===================================================================
+--- dkms.orig/Makefile
++++ dkms/Makefile
+@@ -90,6 +90,10 @@ install-debian: install install-doc
  	chmod +x $(ETC)/template-dkms-mkdeb/debian/postinst
  	chmod +x $(ETC)/template-dkms-mkdeb/debian/prerm
  	chmod +x $(ETC)/template-dkms-mkdeb/debian/rules
@@ -43,11 +43,11 @@ index c64332e..2dc9cf8 100644
  	rm $(DOCDIR)/COPYING*
  	rm $(DOCDIR)/sample*
  
-diff --git a/dkms b/dkms
-index bde0e27..0bc7766 100644
---- a/dkms
-+++ b/dkms
-@@ -122,7 +122,7 @@ show_usage()
+Index: dkms/dkms
+===================================================================
+--- dkms.orig/dkms
++++ dkms/dkms
+@@ -125,7 +125,7 @@ show_usage()
  {
      echo $"Usage: $0 [action] [options]"
      echo $"  [action]  = { add | remove | build | install | uninstall | match | autoinstall"
@@ -56,16 +56,16 @@ index bde0e27..0bc7766 100644
      echo $"  [options] = [-m module] [-v module-version] [-k kernel-version] [-a arch]"
      echo $"              [-d distro] [-c dkms.conf-location] [-q] [--force] [--all]"
      echo $"              [--templatekernel=kernel] [--directive='cli-directive=cli-value']"
-@@ -2829,6 +2829,8 @@ preproc_file()
+@@ -2973,6 +2973,8 @@ preproc_file()
      local date_str="$(date -R)"
      echo "modifying $1..."
      sed -e "s/DEBIAN_PACKAGE/$debian_package/g" \
 +	-e "s/DEBIAN_BUILD_ARCH/$debian_build_arch/g" \
 +	-e "s/KERNEL_VERSION/$kernelver/g" \
- 	-e "s/MODULE_NAME/$module/g" \
- 	-e "s/MODULE_VERSION/$module_version/g" \
- 	-e "s/DATE_STAMP/$date_str/" "$1" > "$1.dkms-pp"
-@@ -2885,6 +2887,7 @@ make_debian()
+         -e "s/MODULE_NAME/$module/g" \
+         -e "s/MODULE_VERSION/$module_version/g" \
+         -e "s/DATE_STAMP/$date_str/" "$1" > "$1.dkms-pp"
+@@ -3035,6 +3037,7 @@ make_debian()
      make_common_test "mk${create_type}"
  
      debian_package=${module//_/-}
@@ -73,46 +73,48 @@ index bde0e27..0bc7766 100644
  
      # Read the conf file
      read_conf_or_die "$kernelver" "$arch"
-@@ -2957,7 +2960,16 @@ make_debian()
- 		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_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
-+	    invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
-+	    ;;
-+	bmdeb)
-+            export KVER="$kernelver"
-+            export KARCH="$arch"
-+	    invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package" || \
-+		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"
- 	    ;;
+@@ -3107,7 +3110,16 @@ make_debian()
+             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_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
++	invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
++	;;
++    bmdeb)
++	export KVER="$kernelver"
++	export KARCH="$arch"
++	invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package" || \
++	    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"
+         ;;
      esac
      popd > /dev/null 2>&1
-@@ -3467,7 +3479,7 @@ die_is_fatal="yes"
- [ -x /sbin/weak-modules ] && weak_modules='/sbin/weak-modules'
+@@ -3634,7 +3646,7 @@ die_is_fatal="yes"
  [ -x /usr/lib/module-init-tools/weak-modules ] && weak_modules='/usr/lib/module-init-tools/weak-modules'
+ no_depmod=""
  
 -action_re='^(remove|(auto|un)?install|match|mk(driverdisk|tarball|rpm|deb|dsc|kmp)|build|add|status|ldtarball)$'
 +action_re='^(remove|(auto|un)?install|match|mk(driverdisk|tarball|rpm|deb|bmdeb|dsc|kmp)|build|add|status|ldtarball)$'
  
  # Parse command line arguments
  while (($# > 0)); do
-@@ -3583,6 +3595,7 @@ for action_to_run in $action; do
- 	mktarball)    make_tarball;;
- 	mkrpm)        make_rpm;;
- 	mkdeb)        make_debian "deb";;
-+	mkbmdeb)      make_debian "bmdeb";;
- 	mkdsc)        make_debian "dsc";;
- 	mkkmp)        have_one_kernel && make_kmp;;
- 	status)       show_status;;
-diff --git a/dkms.8 b/dkms.8
-index 0346a6d..80838ad 100644
---- a/dkms.8
-+++ b/dkms.8
-@@ -261,6 +261,18 @@ load this tarball, build and install modules on the end user's system.  If you d
+@@ -3860,6 +3872,9 @@ for action_to_run in $action; do
+     mkdeb)
+         make_debian "deb"
+         ;;
++    mkbmdeb)
++        make_debian "bmdeb"
++        ;;
+     mkdsc)
+         make_debian "dsc"
+         ;;
+Index: dkms/dkms.8
+===================================================================
+--- dkms.orig/dkms.8
++++ dkms/dkms.8
+@@ -299,6 +299,18 @@ load this tarball, build and install mod
  not want your debian package to contain any prebuilt binaries, be sure to specify
  .B \-\-source\-only
  in the mkdeb command.
@@ -131,11 +133,10 @@ index 0346a6d..80838ad 100644
  .SY mkdsc
  .OP module/module\-version
  .OP -k kernel/arch
-diff --git a/template-dkms-mkbmdeb/Makefile b/template-dkms-mkbmdeb/Makefile
-new file mode 100644
-index 0000000..210b998
+Index: dkms/template-dkms-mkbmdeb/Makefile
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/Makefile
++++ dkms/template-dkms-mkbmdeb/Makefile
 @@ -0,0 +1,18 @@
 +#/usr/bin/make
 +SRC = $(DESTDIR)/usr/src
@@ -155,22 +156,20 @@ index 0000000..210b998
 +	rm -rf dkms_main_tree/ dkms_binaries_only/
 +endif
 +
-diff --git a/template-dkms-mkbmdeb/debian/README.Debian b/template-dkms-mkbmdeb/debian/README.Debian
-new file mode 100644
-index 0000000..f8495d9
+Index: dkms/template-dkms-mkbmdeb/debian/README.Debian
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/debian/README.Debian
++++ dkms/template-dkms-mkbmdeb/debian/README.Debian
 @@ -0,0 +1,5 @@
 +MODULE_NAME DKMS module for Debian
 +
 +This package was automatically generated by the DKMS system,
 +for distribution on Debian based operating systems.
 +
-diff --git a/template-dkms-mkbmdeb/debian/changelog b/template-dkms-mkbmdeb/debian/changelog
-new file mode 100644
-index 0000000..b6cc91d
+Index: dkms/template-dkms-mkbmdeb/debian/changelog
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/debian/changelog
++++ dkms/template-dkms-mkbmdeb/debian/changelog
 @@ -0,0 +1,6 @@
 +DEBIAN_PACKAGE-dkms-bin (MODULE_VERSION) stable; urgency=low
 +
@@ -178,18 +177,16 @@ index 0000000..b6cc91d
 +
 + -- Dynamic Kernel Modules Support Team <pkg-dkms-maint at lists.alioth.debian.org>  DATE_STAMP
 +
-diff --git a/template-dkms-mkbmdeb/debian/compat b/template-dkms-mkbmdeb/debian/compat
-new file mode 100644
-index 0000000..7f8f011
+Index: dkms/template-dkms-mkbmdeb/debian/compat
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/debian/compat
++++ dkms/template-dkms-mkbmdeb/debian/compat
 @@ -0,0 +1 @@
 +7
-diff --git a/template-dkms-mkbmdeb/debian/control b/template-dkms-mkbmdeb/debian/control
-new file mode 100644
-index 0000000..05fdeaf
+Index: dkms/template-dkms-mkbmdeb/debian/control
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/debian/control
++++ dkms/template-dkms-mkbmdeb/debian/control
 @@ -0,0 +1,13 @@
 +Source: DEBIAN_PACKAGE-dkms-bin
 +Section: misc
@@ -204,19 +201,17 @@ index 0000000..05fdeaf
 +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 --git a/template-dkms-mkbmdeb/debian/copyright b/template-dkms-mkbmdeb/debian/copyright
-new file mode 100644
-index 0000000..ad983f3
+Index: dkms/template-dkms-mkbmdeb/debian/copyright
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/debian/copyright
++++ dkms/template-dkms-mkbmdeb/debian/copyright
 @@ -0,0 +1,2 @@
 +
 +This copyright has not been completed by the author of this package.
-diff --git a/template-dkms-mkbmdeb/debian/rules b/template-dkms-mkbmdeb/debian/rules
-new file mode 100644
-index 0000000..b931f5e
+Index: dkms/template-dkms-mkbmdeb/debian/rules
+===================================================================
 --- /dev/null
-+++ b/template-dkms-mkbmdeb/debian/rules
++++ dkms/template-dkms-mkbmdeb/debian/rules
 @@ -0,0 +1,57 @@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
diff --git a/debian/patches/0005-fix_have_one_kernel_for_non-zero_return_code.patch b/debian/patches/0005-fix_have_one_kernel_for_non-zero_return_code.patch
deleted file mode 100644
index e15f005..0000000
--- a/debian/patches/0005-fix_have_one_kernel_for_non-zero_return_code.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Dynamic Kernel Modules Support Team
- <pkg-dkms-maint at lists.alioth.debian.org>
-Date: Wed, 6 Jul 2016 05:24:47 +0800
-Subject: fix_have_one_kernel_for_non-zero_return_code
-
----
- dkms | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/dkms b/dkms
-index 9d24bd9..5f2b5ea 100644
---- a/dkms
-+++ b/dkms
-@@ -163,11 +163,14 @@ set_kernel_source_dir()
- 
- # A little test function for DKMS commands that only work on one kernel.
- have_one_kernel() {
--    (( ${#kernelver[@]} > 1 )) && \
--	die 4 $"The action $1 does not support multiple kernel version" \
--	$"parameters on the command line."
--    [[ $all ]] && die 5 $"The action $1 does not support the --all" \
--	$"parameter."
-+    if (( ${#kernelver[@]} != 1 )); then
-+        die 4 $"The action $1 does not support multiple kernel version" \
-+        $"parameters on the command line."
-+    fi
-+    if [[ $all ]]; then
-+        die 5 $"The action $1 does not support the --all" \
-+        $"parameter."
-+    fi
- }
- 
- # Set up the kernelver and arch arrays.  You must have a 1:1 correspondence --
diff --git a/debian/patches/0006-690865.patch b/debian/patches/0006-690865.patch
deleted file mode 100644
index b8c18cc..0000000
--- a/debian/patches/0006-690865.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dynamic Kernel Modules Support Team
- <pkg-dkms-maint at lists.alioth.debian.org>
-Date: Wed, 6 Jul 2016 05:24:47 +0800
-Subject: 690865
-
----
- dkms.8 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/dkms.8 b/dkms.8
-index 908d9db..811eb88 100644
---- a/dkms.8
-+++ b/dkms.8
-@@ -243,7 +243,6 @@ load this tarball, build and install modules on the end user's system.  If you d
- not want your RPM to contain any prebuilt binaries, be sure to specify
- .B \-\-source\-only
- in the mkrpm command.
--.TP
- .SY mkdeb
- .OP module/module\-version
- .OP -k kernel/arch
diff --git a/debian/patches/0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch b/debian/patches/0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
deleted file mode 100644
index 4c48e58..0000000
--- a/debian/patches/0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Darik Horn <dajhorn at vanadac.com>
-Date: Mon, 27 Feb 2012 20:45:37 -0600
-Subject: Add POST_BUILD to the dkms_conf_variables list.
-
-The POST_BUILD directive is ignored by the read_conf() function
-because it not in dkms_conf_variables list.
----
- dkms | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dkms b/dkms
-index 5f2b5ea..c49a848 100644
---- a/dkms
-+++ b/dkms
-@@ -24,7 +24,7 @@ shopt -s extglob
- # All of the variables we will accept from dkms.conf.
- # Does not include directives
- readonly dkms_conf_variables="CLEAN REMAKE_INITRD remake_initrd PACKAGE_NAME
--       PACKAGE_VERSION POST_ADD POST_INSTALL POST_REMOVE PRE_BUILD
-+       PACKAGE_VERSION POST_ADD POST_BUILD POST_INSTALL POST_REMOVE PRE_BUILD
-        PRE_INSTALL BUILD_EXCLUSIVE_KERNEL BUILD_EXCLUSIVE_ARCH
-        build_exclude OBSOLETE_BY MAKE MAKE_MATCH MODULES_CONF
-        modules_conf_array PATCH PATCH_MATCH patch_array BUILT_MODULE_NAME
diff --git a/debian/patches/0008-Add-BUILD_DEPENDS-configuration-option.patch b/debian/patches/0008-Add-BUILD_DEPENDS-configuration-option.patch
deleted file mode 100644
index b7d3531..0000000
--- a/debian/patches/0008-Add-BUILD_DEPENDS-configuration-option.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From: Darik Horn <dajhorn at vanadac.com>
-Date: Mon, 15 Jul 2013 16:25:02 -0500
-Subject: Add BUILD_DEPENDS configuration option.
-
-Implement a BUILD_DEPENDS directive that instructs `dkms autoinstall`
-to build Linux modules in a specific order. The motivating case is
-
-  lustre -> zfs -> spl
-
-Where ZFS fails to build if SPL is not already installed.
-
-[ Colin Ian King: Modified to sync with latest dkms patches ]
-
-Signed-off-by: Darik Horn <dajhorn at vanadac.com>
-Signed-off-by: Brian Behlendorf <behlendorf1 at llnl.gov>
----
- dkms   | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
- dkms.8 |  8 ++++++++
- 2 files changed, 68 insertions(+), 10 deletions(-)
-
-diff --git a/dkms b/dkms
-index c49a848..2335f4a 100644
---- a/dkms
-+++ b/dkms
-@@ -25,7 +25,7 @@ shopt -s extglob
- # Does not include directives
- readonly dkms_conf_variables="CLEAN REMAKE_INITRD remake_initrd PACKAGE_NAME
-        PACKAGE_VERSION POST_ADD POST_BUILD POST_INSTALL POST_REMOVE PRE_BUILD
--       PRE_INSTALL BUILD_EXCLUSIVE_KERNEL BUILD_EXCLUSIVE_ARCH
-+       PRE_INSTALL BUILD_DEPENDS BUILD_EXCLUSIVE_KERNEL BUILD_EXCLUSIVE_ARCH
-        build_exclude OBSOLETE_BY MAKE MAKE_MATCH MODULES_CONF
-        modules_conf_array PATCH PATCH_MATCH patch_array BUILT_MODULE_NAME
-        built_module_name BUILT_MODULE_LOCATION built_module_location
-@@ -3135,15 +3135,26 @@ make_kmp()
- # by hand if dkms_autoinstaller is not used.
- autoinstall() {
-     local status mv mvka m v k a last_v last_m tenative
-+    local install_count next_depends
-     local -a to_install=()
-+    local -a next_install=()
-+    local -a installed_modules=()
-+    local -A build_depends=()
-+
-     # Walk through our list of installed and built modules, and create
-     # a list of modules that need to be reinstalled.
-     while read status mvka; do
-         IFS='/' read m v k a <<< "$mvka"
-         [[ ! $last_m ]] && last_m="$m"
-         # If the module is already installed or weak-installed, skip it.
--        _is_module_installed "$m" "$v" "$kernelver" "$arch" && continue
--        module_status_weak "$m" "$v" "$kernelver" "$arch" >/dev/null && continue
-+        if _is_module_installed "$m" "$v" "$kernelver" "$arch"; then
-+            installed_modules[${#installed_modules[@]}]="$m"
-+            continue
-+        fi
-+        if module_status_weak "$m" "$v" "$kernelver" "$arch" >/dev/null; then
-+            installed_modules[${#installed_modules[@]}]="$m"
-+            continue
-+        fi
-         # if the module does not want to be autoinstalled, skip it.
-         read_conf_or_die "$k" "$a" "$dkms_tree/$m/$v/source/dkms.conf"
-         if [[ ! $AUTOINSTALL ]]; then
-@@ -3152,7 +3163,10 @@ autoinstall() {
-         elif [[ $last_m != $m ]]; then
-             last_m="$m"
-             last_v='0'
--            [[ $tenative ]] && to_install[${#to_install[@]}]="$tenative"
-+            if [[ $tenative ]]; then
-+                to_install[${#to_install[@]}]="$tenative"
-+                build_depends["$m"]="${BUILD_DEPENDS[@]}"
-+            fi
-             tenative=''
-         fi
-         if [[ ($(VER $v) > $(VER $last_v)) ]]; then
-@@ -3162,14 +3176,50 @@ autoinstall() {
-     done < <(module_status)
-     # We may have exited the loop with $tenative set.  If it is,
-     # it contains something that should be updated.
--    [[ $tenative ]] && to_install[${#to_install[@]}]="$tenative"
-+    if [[ $tenative ]]; then
-+        to_install[${#to_install[@]}]="$tenative"
-+        build_depends["$m"]="${BUILD_DEPENDS[@]}"
-+    fi
-     [[ $to_install ]] || return 0
--    # Install modules that need to be updated in parallel.
--    for mv in "${to_install[@]}"; do
--        IFS=/ read m v <<< "$mv"
--        (module="$m"; module_version="$v"; install_module) &
-+
-+    while true; do
-+        install_count=0
-+        next_install=( )
-+
-+        # Step 1: Remove installed modules from all dependency lists.
-+        for m in ${!build_depends[@]}; do
-+            next_depends=
-+            for d in ${build_depends[$m]}; do
-+                for i in ${installed_modules[@]}; do
-+                    [[ "$d" = "$i" ]] && continue 2
-+                done
-+                next_depends+="$d "
-+            done
-+            build_depends[$m]="${next_depends%% }"
-+        done
-+
-+        # Step 2: Install modules that have an empty dependency list.
-+        for mv in "${to_install[@]}"; do
-+            IFS=/ read m v <<< "$mv"
-+            if [[ -z "${build_depends[$m]}" ]]; then
-+                (module="$m"; module_version="$v"; install_module) &
-+                installed_modules[${#installed_modules[@]}]="$m"
-+                install_count=$(($install_count +1))
-+            else
-+                next_install[${#next_install[@]}]="$mv"
-+            fi
-+         done
-+
-+         wait
-+
-+         # Step 3: Keep going if at least one module was installed during
-+         # this iteration.
-+         [[ "$install_count" -gt 0 ]] || break;
-+
-+         # Step 4: Remove modules that were installed during Step 2 from
-+         # the job queue.
-+         to_install=( "${next_install[@]}" )
-     done
--    wait
- }
- 
- function make_redhat3_driver_disk ()
-diff --git a/dkms.8 b/dkms.8
-index 811eb88..556703d 100644
---- a/dkms.8
-+++ b/dkms.8
-@@ -824,6 +824,14 @@ on
- .B dkms_autoinstaller
- for more information.
- .TP
-+.B BUILD_DEPENDS[#]=
-+This optional directive is an array that allows you to specify other modules as
-+dependencies for your module. Each array element should be the
-+.B PACKAGE_NAME
-+of another module that is managed by dkms. Do not specify a version or
-+architecture in the dependency. Note that this directive is only advisory;
-+missing or broken dependencies cause non-fatal warnings.
-+.TP
- .B BUILD_EXCLUSIVE_KERNEL=
- This optional directive allows you to specify a regular expression which defines
- the subset of kernels which DKMS is allowed to build your module for.  If the kernel
diff --git a/debian/patches/0009-apport-write-binary.patch b/debian/patches/0009-apport-write-binary.patch
deleted file mode 100644
index b1cf6af..0000000
--- a/debian/patches/0009-apport-write-binary.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Dynamic Kernel Modules Support Team
- <pkg-dkms-maint at lists.alioth.debian.org>
-Date: Wed, 6 Jul 2016 05:24:48 +0800
-Subject: apport-write-binary
-
----
- dkms_apport.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dkms_apport.py b/dkms_apport.py
-index 8b2ca84..c359486 100755
---- a/dkms_apport.py
-+++ b/dkms_apport.py
-@@ -92,4 +92,4 @@ if 'DKMSBuildLog' in report:
- 
- if options.kernel:
-     report['DKMSKernelVersion'] = options.kernel
--report.write(open(apport.fileutils.make_report_path(report), 'w'))
-+report.write(open(apport.fileutils.make_report_path(report), 'wb'))
diff --git a/debian/patches/0010-parallell-build.patch b/debian/patches/0010-parallell-build.patch
deleted file mode 100644
index b011c2e..0000000
--- a/debian/patches/0010-parallell-build.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Dynamic Kernel Modules Support Team
- <pkg-dkms-maint at lists.alioth.debian.org>
-Date: Wed, 6 Jul 2016 05:24:48 +0800
-Subject: parallell-build
-
----
- dkms   | 28 ++++++++++++++++++++++++----
- dkms.8 |  9 +++++++++
- 2 files changed, 33 insertions(+), 4 deletions(-)
-
-diff --git a/dkms b/dkms
-index 2335f4a..3b82975 100644
---- a/dkms
-+++ b/dkms
-@@ -127,6 +127,7 @@ show_usage()
-     echo $"              [--kernelsourcedir=source-location] [--no-prepare-kernel] [--no-initrd]"
-     echo $"              [--binaries-only] [--source-only] [-r release (SuSE)] [--verbose]"
-     echo $"              [--size] [--spec=specfile] [--media=floppy|iso|tar] [--legacy-postinst=0|1]"
-+    echo $"              [-j number]"
- }
- 
- VER()
-@@ -145,6 +146,18 @@ VER()
- 		  -e 's: ::g'
- }
- 
-+# Find out how many CPUs there are so that we may pass an appropriate -j
-+# option to make. Ignore hyperthreading for now.
-+get_num_cpus()
-+{
-+   # use nproc(1) from coreutils 8.1-1+ if available, otherwise single job
-+   if [ -x /usr/bin/nproc ]; then
-+	nproc
-+   else
-+	echo "1"
-+  fi
-+}
-+
- # Figure out the correct module suffix for the kernel we are currently
- # dealing with, which may or may not be the currently installed kernel.
- set_module_suffix()
-@@ -1089,7 +1102,7 @@ prepare_kernel()
- 	invoke_command "cp /boot/vmlinuz.version.h include/linux/version.h" "using /boot/vmlinux.version.h"
- 	invoke_command "cp -f $kernel_config .config" "using $kernel_config"
- 	invoke_command "make KERNELRELEASE=$1 cloneconfig" "make cloneconfig" background
--	invoke_command "make CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make CONFIG_MODVERSIONS=1 dep" background
-+	invoke_command "make -j$parallel_jobs CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make CONFIG_MODVERSIONS=1 dep" background
-     elif grep -q rhconfig.h $kernel_source_dir/include/linux/{modversions,version}.h 2>/dev/null; then
- 	echo $"Running Red Hat style preparation routine"
- 	invoke_command "make clean" "make clean" background
-@@ -1135,9 +1148,9 @@ prepare_kernel()
- 
- 	invoke_command "make KERNELRELEASE=$1 oldconfig" "make oldconfig" background
- 	if [[ $(VER $1) < $(VER 2.5) ]]; then
--	    invoke_command "make KERNELRELEASE=$1 dep" "make dep" background
-+	    invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 dep" "make dep" background
- 	else
--	    invoke_command "make KERNELRELEASE=$1 prepare-all scripts" "make prepare-all" background
-+	    invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 prepare-all scripts" "make prepare-all" background
- 	fi
-     fi
-     cd - >/dev/null
-@@ -1209,7 +1222,7 @@ do_build()
-     invoke_command "$clean" "cleaning build area" background
-     echo $"DKMS make.log for $module-$module_version for kernel $kernelver ($arch)" >> "$dkms_tree/$module/$module_version/build/make.log"
-     date >> "$dkms_tree/$module/$module_version/build/make.log"
--    local the_make_command="${make_command/#make/make KERNELRELEASE=$kernelver}"
-+    local the_make_command="${make_command/#make/make -j$parallel_jobs KERNELRELEASE=$kernelver}"
- 
-     invoke_command "{ $the_make_command; } >> $dkms_tree/$module/$module_version/build/make.log 2>&1" "$the_make_command" background || \
- 	report_build_problem 10 $"Bad return status for module build on kernel: $kernelver ($arch)" \
-@@ -3498,6 +3511,7 @@ while (($# > 0)); do
- 	--debug)
- 	    export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): '
- 	    set -x;;
-+	-j)                  read_arg parallel_jobs "$1" "$2" || shift;;
- 	-*|--*)              error $" Unknown option: $1"
- 			     show_usage
- 			     exit 2;;
-@@ -3545,6 +3559,12 @@ if [[ $arch && $all ]]; then
- 	$"--all on the command line."
- fi
- 
-+# Default to -j<number of CPUs>
-+parallel_jobs=${parallel_jobs:-$(get_num_cpus)}
-+
-+# Make sure we're not passing -j0 to make; treat -j0 as just "-j"
-+[[ "$parallel_jobs" = 0 ]] && parallel_jobs=""
-+
- # Run the specified action
- for action_to_run in $action; do
-     setup_kernels_arches "$action_to_run"
-diff --git a/dkms.8 b/dkms.8
-index 556703d..0346a6d 100644
---- a/dkms.8
-+++ b/dkms.8
-@@ -515,6 +515,15 @@ prior than DKMS 2.1.  This option currently defaults to 1.
- A supplemental configuration file to the system-wide dkms framework, typically located
- in /etc/dkms/framework.conf.  All option that are normally provided on a command line
- can be provided in this file.
-+.TP
-+.B \-j number
-+Run no more than
-+.I number
-+jobs in parallel; see the -j option of
-+.I make(1).
-+Defaults to the number of CPUs in the system, detected by
-+.I nproc(1).
-+Specify 0 to impose no limit on the number of parallel jobs.
- .SH ORIGINAL MODULES
- During the first install of a module for a <kernelversion>,
- .B dkms
diff --git a/debian/patches/0011-690866-helpmsg.patch b/debian/patches/0011-690866-helpmsg.patch
deleted file mode 100644
index dc4b67d..0000000
--- a/debian/patches/0011-690866-helpmsg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Dynamic Kernel Modules Support Team
- <pkg-dkms-maint at lists.alioth.debian.org>
-Date: Wed, 6 Jul 2016 05:24:48 +0800
-Subject: 690866-helpmsg
-
----
- dkms_common.postinst | 2 +-
- sample.spec          | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dkms_common.postinst b/dkms_common.postinst
-index 0c8cfc1..f0db448 100644
---- a/dkms_common.postinst
-+++ b/dkms_common.postinst
-@@ -282,7 +282,7 @@ for KERNEL in $KERNELS; do
-             dkms_status=`dkms status -m $NAME -v $VERSION -k $KERNEL $ARCH`
-         else
-             echo "Module build for the currently running kernel was skipped since the"
--            echo "kernel source for this kernel does not seem to be installed."
-+            echo "kernel headers for this kernel do not seem to be installed."
-         fi
-     fi
- 
-diff --git a/sample.spec b/sample.spec
-index ff8421f..3abdf07 100644
---- a/sample.spec
-+++ b/sample.spec
-@@ -93,7 +93,7 @@ if [ -z "$loaded_tarballs" ]; then
- 	else
- 		echo -e ""
- 		echo -e "Module build for the currently running kernel was skipped since the"
--		echo -e "kernel source for this kernel does not seem to be installed."
-+		echo -e "kernel headers for this kernel do not seem to be installed."
- 	fi
- fi
- exit 0
diff --git a/debian/patches/0013-Port-apport-hook-to-python3.patch b/debian/patches/0013-Port-apport-hook-to-python3.patch
deleted file mode 100644
index 62def20..0000000
--- a/debian/patches/0013-Port-apport-hook-to-python3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Dirk Griesbach <spamthis at freenet.de>
-Date: Wed, 6 Jul 2016 05:27:08 +0800
-Subject: Port apport hook to python3
-
----
- dkms_apport.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/dkms_apport.py b/dkms_apport.py
-index c359486..08581c5 100755
---- a/dkms_apport.py
-+++ b/dkms_apport.py
-@@ -36,12 +36,12 @@ optparser.add_option('-k', help="Specify the kernel version",
- options=optparser.parse_args()[0]
- 
- if not options.module or not options.version:
--    print >> sys.stderr, 'ERROR (dkms apport): both -m and -v are required'
-+    print('ERROR (dkms apport): both -m and -v are required', file=sys.stderr)
-     sys.exit(2)
- 
- package=packaging.get_file_package('/usr/src/' + options.module + '-' + options.version)
- if package is None:
--    print >> sys.stderr, 'ERROR (dkms apport): binary package for %s: %s not found' % (options.module,options.version)
-+    print('ERROR (dkms apport): binary package for %s: %s not found' % (options.module,options.version), file=sys.stderr)
-     sys.exit(1)
- 
- if options.kernel:
-@@ -50,9 +50,9 @@ if options.kernel:
- 
-     try:
-         apport.packaging.is_distro_package(kernel_package)
--    except ValueError, e:
-+    except ValueError as e:
-         if e == 'package does not exist':
--            print >> sys.stderr, 'ERROR (dkms apport): kernel package %s is not supported' % (kernel_package)
-+            print('ERROR (dkms apport): kernel package %s is not supported' % (kernel_package), file=sys.stderr)
-             sys.exit(1)
- 
- make_log=os.path.join('/var','lib','dkms',options.module,options.version,'build','make.log')
-@@ -62,7 +62,7 @@ report['Package'] = package
- try:
-     report['SourcePackage'] = apport.packaging.get_source(package)
- except ValueError:
--    print >> sys.stderr, 'ERROR (dkms apport): unable to determine source package for %s' % package
-+    print('ERROR (dkms apport): unable to determine source package for %s' % package, file=sys.stderr)
-     sys.exit(3)
- try:
-     version = packaging.get_version(package)
-@@ -81,7 +81,7 @@ attach_file_if_exists(report, make_log, 'DKMSBuildLog')
- if 'DKMSBuildLog' in report:
-     this_year = str(datetime.today().year)
-     if 'Segmentation fault' in report['DKMSBuildLog']:
--        print >> sys.stderr, 'ERROR (dkms apport): There was a segmentation fault when trying to build the module'
-+        print('ERROR (dkms apport): There was a segmentation fault when trying to build the module', file=sys.stderr)
-         sys.exit(1)
-     dupe_sig = ''
-     for line in report['DKMSBuildLog'].split('\n'):
diff --git a/debian/patches/series b/debian/patches/series
index 7858d75..e574e77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,4 @@
-0001-do-not-fail-if-lib-modules-does-not-exist.patch
-0002-remove-the-directory-where-the-module-was-installed-.patch
-0003-688904.patch
-0004-757758.patch
-0005-fix_have_one_kernel_for_non-zero_return_code.patch
-0006-690865.patch
-0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
-0008-Add-BUILD_DEPENDS-configuration-option.patch
-0009-apport-write-binary.patch
-0010-parallell-build.patch
-0011-690866-helpmsg.patch
-0012-Do-not-ignore-kernelsourcedir.patch
-0013-Port-apport-hook-to-python3.patch
-0014-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
+0001-688904.patch
+0002-757758.patch
+0003-Do-not-ignore-kernelsourcedir.patch
+0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dkms/dkms.git



More information about the Pkg-dkms-commits mailing list