[Pkg-dkms-commits] [dkms] 04/07: Use gbp-pq to manage patches
Aron Xu
aron at debian.org
Tue Jul 5 22:00:56 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 f2bca1037f3de8a7a3a66a0a7c489bb62e48ce66
Author: Aron Xu <aron at debian.org>
Date: Wed Jul 6 05:25:03 2016 +0800
Use gbp-pq to manage patches
---
...o-not-fail-if-lib-modules-does-not-exist.patch} | 6 +++-
...irectory-where-the-module-was-installed-.patch} | 13 +++++----
debian/patches/{688904.patch => 0003-688904.patch} | 17 ++++++++++--
debian/patches/{757758.patch => 0004-757758.patch} | 13 ++++++++-
...have_one_kernel_for_non-zero_return_code.patch} | 16 +++++++----
debian/patches/0006-690865.patch | 21 ++++++++++++++
...ST_BUILD-to-the-dkms_conf_variables-list.patch} | 7 ++---
...8-Add-BUILD_DEPENDS-configuration-option.patch} | 20 ++++++++------
debian/patches/0009-apport-write-binary.patch | 19 +++++++++++++
...lell-build.patch => 0010-parallell-build.patch} | 32 ++++++++++++----------
...866-helpmsg.patch => 0011-690866-helpmsg.patch} | 28 +++++++++++--------
...ch => 0012-Do-not-ignore-kernelsourcedir.patch} | 14 +++++++---
debian/patches/690865.patch | 17 ------------
debian/patches/apport-write-binary.patch | 17 ------------
debian/patches/series | 24 ++++++++--------
15 files changed, 162 insertions(+), 102 deletions(-)
diff --git a/debian/patches/666023.patch b/debian/patches/0001-do-not-fail-if-lib-modules-does-not-exist.patch
similarity index 81%
rename from debian/patches/666023.patch
rename to debian/patches/0001-do-not-fail-if-lib-modules-does-not-exist.patch
index 14db7d7..b1b5763 100644
--- a/debian/patches/666023.patch
+++ b/debian/patches/0001-do-not-fail-if-lib-modules-does-not-exist.patch
@@ -1,6 +1,10 @@
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
-Bug-Debian: http://bugs.debian.org/666023
+
+---
+ 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
diff --git a/debian/patches/657145.patch b/debian/patches/0002-remove-the-directory-where-the-module-was-installed-.patch
similarity index 73%
rename from debian/patches/657145.patch
rename to debian/patches/0002-remove-the-directory-where-the-module-was-installed-.patch
index 58280d1..3f3eaed 100644
--- a/debian/patches/657145.patch
+++ b/debian/patches/0002-remove-the-directory-where-the-module-was-installed-.patch
@@ -1,9 +1,12 @@
From: Andreas Beckmann <debian at abeckmann.de>
-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
-Bug-Debian: http://bugs.debian.org/657145
+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
diff --git a/debian/patches/688904.patch b/debian/patches/0003-688904.patch
similarity index 62%
rename from debian/patches/688904.patch
rename to debian/patches/0003-688904.patch
index 7b2c1f0..7ec3e11 100644
--- a/debian/patches/688904.patch
+++ b/debian/patches/0003-688904.patch
@@ -1,5 +1,16 @@
---- a/dkms 2012-10-01 15:44:50.000000000 -0700
-+++ b/dkms 2012-10-01 15:44:25.981366657 -0700
+From: Dynamic Kernel Modules Support Team
+ <pkg-dkms-maint at lists.alioth.debian.org>
+Date: Wed, 6 Jul 2016 05:24:47 +0800
+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 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
@@ -8,7 +19,7 @@
# All of the variables we will accept from dkms.conf.
# Does not include directives
-@@ -1827,7 +1831,7 @@
+@@ -1827,7 +1828,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=''
diff --git a/debian/patches/757758.patch b/debian/patches/0004-757758.patch
similarity index 74%
rename from debian/patches/757758.patch
rename to debian/patches/0004-757758.patch
index b555b3b..413e7a8 100644
--- a/debian/patches/757758.patch
+++ b/debian/patches/0004-757758.patch
@@ -1,6 +1,17 @@
+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 +766,17 @@
+@@ -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
diff --git a/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff b/debian/patches/0005-fix_have_one_kernel_for_non-zero_return_code.patch
similarity index 66%
rename from debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff
rename to debian/patches/0005-fix_have_one_kernel_for_non-zero_return_code.patch
index b95a199..e15f005 100644
--- a/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff
+++ b/debian/patches/0005-fix_have_one_kernel_for_non-zero_return_code.patch
@@ -1,11 +1,17 @@
-Description: Fixes function have_one_kernel in dkms script for non-zero return code
-Author: Mario Limonciello <Mario_Limonciello at Dell.com>
-Origin: upstream
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1261116
+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 @@
+@@ -163,11 +163,14 @@ set_kernel_source_dir()
# A little test function for DKMS commands that only work on one kernel.
have_one_kernel() {
diff --git a/debian/patches/0006-690865.patch b/debian/patches/0006-690865.patch
new file mode 100644
index 0000000..b8c18cc
--- /dev/null
+++ b/debian/patches/0006-690865.patch
@@ -0,0 +1,21 @@
+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/1491729-0001-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch b/debian/patches/0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
similarity index 91%
rename from debian/patches/1491729-0001-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
rename to debian/patches/0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
index 40f6c8b..4c48e58 100644
--- a/debian/patches/1491729-0001-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
+++ b/debian/patches/0007-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
@@ -5,14 +5,14 @@ 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 +-
+ dkms | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dkms b/dkms
-index 4381dd4..df1ff57 100644
+index 5f2b5ea..c49a848 100644
--- a/dkms
+++ b/dkms
-@@ -24,7 +24,7 @@
+@@ -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
@@ -21,4 +21,3 @@ index 4381dd4..df1ff57 100644
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/1491729-0002-Add_BUILD_DEPENDS_configuration_option.patch b/debian/patches/0008-Add-BUILD_DEPENDS-configuration-option.patch
similarity index 94%
rename from debian/patches/1491729-0002-Add_BUILD_DEPENDS_configuration_option.patch
rename to debian/patches/0008-Add-BUILD_DEPENDS-configuration-option.patch
index 72805a3..b7d3531 100644
--- a/debian/patches/1491729-0002-Add_BUILD_DEPENDS_configuration_option.patch
+++ b/debian/patches/0008-Add-BUILD_DEPENDS-configuration-option.patch
@@ -13,11 +13,15 @@ Where ZFS fails to build if SPL is not already installed.
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(-)
-Index: dkms/dkms
-===================================================================
---- dkms.orig/dkms
-+++ dkms/dkms
+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
@@ -125,10 +129,10 @@ Index: dkms/dkms
}
function make_redhat3_driver_disk ()
-Index: dkms/dkms.8
-===================================================================
---- dkms.orig/dkms.8
-+++ dkms/dkms.8
+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.
diff --git a/debian/patches/0009-apport-write-binary.patch b/debian/patches/0009-apport-write-binary.patch
new file mode 100644
index 0000000..b1cf6af
--- /dev/null
+++ b/debian/patches/0009-apport-write-binary.patch
@@ -0,0 +1,19 @@
+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/parallell-build.patch b/debian/patches/0010-parallell-build.patch
similarity index 87%
rename from debian/patches/parallell-build.patch
rename to debian/patches/0010-parallell-build.patch
index 06b0680..b011c2e 100644
--- a/debian/patches/parallell-build.patch
+++ b/debian/patches/0010-parallell-build.patch
@@ -1,15 +1,17 @@
-Description: Build in parallell by default.
- Build using 'make -j#' where # is based on the number of CPU cores available.
- Patch was updated by Aron Xu <aron at debian.org>.
-Author: Andras Korn <korn-debbugs at elan.rulez.org>
-Bug-Debian: https://bugs.debian.org/663114
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663114
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2016-05-01
+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-2.2.0.3.orig/dkms
-+++ dkms-2.2.0.3/dkms
+---
+ 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]"
@@ -88,9 +90,11 @@ Last-Update: 2016-05-01
# Run the specified action
for action_to_run in $action; do
setup_kernels_arches "$action_to_run"
---- dkms-2.2.0.3.orig/dkms.8
-+++ dkms-2.2.0.3/dkms.8
-@@ -515,6 +515,15 @@ prior than DKMS 2.1. This option curren
+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.
diff --git a/debian/patches/690866-helpmsg.patch b/debian/patches/0011-690866-helpmsg.patch
similarity index 59%
rename from debian/patches/690866-helpmsg.patch
rename to debian/patches/0011-690866-helpmsg.patch
index 11710e1..dc4b67d 100644
--- a/debian/patches/690866-helpmsg.patch
+++ b/debian/patches/0011-690866-helpmsg.patch
@@ -1,13 +1,17 @@
-Description: Improve message printed when kernel headers are missing.
-Author: Thijs Kinkhorst <thijs at debian.org>
-Bug-Debian: https://bugs.debian.org/690866
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690866
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2016-05-01
+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-2.2.0.3.orig/dkms_common.postinst
-+++ dkms-2.2.0.3/dkms_common.postinst
+---
+ 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
@@ -17,8 +21,10 @@ Last-Update: 2016-05-01
fi
fi
---- dkms-2.2.0.3.orig/sample.spec
-+++ dkms-2.2.0.3/sample.spec
+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 ""
diff --git a/debian/patches/653176.patch b/debian/patches/0012-Do-not-ignore-kernelsourcedir.patch
similarity index 71%
rename from debian/patches/653176.patch
rename to debian/patches/0012-Do-not-ignore-kernelsourcedir.patch
index dbc77bc..ae866ae 100644
--- a/debian/patches/653176.patch
+++ b/debian/patches/0012-Do-not-ignore-kernelsourcedir.patch
@@ -1,10 +1,16 @@
From: Evgeni Golov <evgeni at debian.org>
+Date: Wed, 6 Jul 2016 05:24:48 +0800
Subject: Do not ignore --kernelsourcedir
-Bug-Debian: 653176
-Index: dkms/dkms
+
===================================================================
---- dkms.orig/dkms
-+++ dkms/dkms
+---
+ 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() {
Linux) DIR="/lib/modules/$KVER/build" ;;
GNU/kFreeBSD) DIR="/usr/src/kfreebsd-headers-$KVER/sys" ;;
diff --git a/debian/patches/690865.patch b/debian/patches/690865.patch
deleted file mode 100644
index c3d6fc9..0000000
--- a/debian/patches/690865.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Correct indentation of mkdeb in dkms(8) manual page.
-Author: Thijs Kinkhorst
-Bug-Debian: https://bugs.debian.org/690865
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2016-04-26
-
---- dkms-2.2.0.3.orig/dkms.8
-+++ dkms-2.2.0.3/dkms.8
-@@ -243,7 +243,6 @@ load this tarball, build and install mod
- 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/apport-write-binary.patch b/debian/patches/apport-write-binary.patch
deleted file mode 100644
index 50fc116..0000000
--- a/debian/patches/apport-write-binary.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Make sure apport code write files in binary mode.
- Without this patch, dkms_packages.py crashed with AssertionError in
- _assert_bin_mode(): file stream must be in binary mode
-Author: Ritesh Raj Sarraf <rrs at debian.org>
-Bug-Debian: https://bugs.debian.org/684377
-Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685208#10
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2016-05-01
-
---- dkms-2.2.0.3.orig/dkms_apport.py
-+++ dkms-2.2.0.3/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/series b/debian/patches/series
index cb982fe..97bd7b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,12 @@
-666023.patch
-657145.patch
-688904.patch
-757758.patch
-fix_have_one_kernel_for_non-zero_return_code.diff
-690865.patch
-1491729-0001-Add-POST_BUILD-to-the-dkms_conf_variables-list.patch
-1491729-0002-Add_BUILD_DEPENDS_configuration_option.patch
-apport-write-binary.patch
-parallell-build.patch
-690866-helpmsg.patch
-653176.patch
+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
--
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