[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-2-2-g07c63ab
Michael Gilbert
michael.s.gilbert at gmail.com
Mon May 17 03:16:46 UTC 2010
The following commit has been merged in the master branch:
commit 07c63ab45fbc378c07bdd7ef57922f4661b65806
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Sun May 16 23:17:17 2010 -0400
fix some bugs
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 9dc3fca..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/patches/fix-bashism.patch b/debian/patches/fix-bashism.patch
new file mode 100644
index 0000000..da7f6af
--- /dev/null
+++ b/debian/patches/fix-bashism.patch
@@ -0,0 +1,12 @@
+Description: Fix bashism
+--- dkms-2.1.1.2.orig/dkms_common.postinst
++++ dkms-2.1.1.2/dkms_common.postinst
+@@ -99,7 +99,7 @@ get_newest_kernel() {
+ CURRENT_ABI=${CURRENT_ABI%%-*}
+ NEWEST_KERNEL=$(_get_newest_kernel_debian "$CURRENT_VERSION-$CURRENT_ABI")
+
+- elif [ `which rpm &>/dev/null` ]; then
++ elif [ `which rpm >/dev/null` ]; then
+ # If RPM based
+ NEWEST_KERNEL=$(_get_newest_kernel_rhel)
+ fi
diff --git a/debian/patches/manpage-update.patch b/debian/patches/manpage-update.patch
new file mode 100644
index 0000000..a562d21
--- /dev/null
+++ b/debian/patches/manpage-update.patch
@@ -0,0 +1,42 @@
+Description: Upstream changes introduced in version 2.1.1.2-3
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ dkms (2.1.1.2-3) UNRELEASED; urgency=low
+ .
+ [ Michael Gilbert ]
+ * Add missing depends on python (needed by dkms.py).
+ * Update to source format 3 (quilt) for better patch management/handling.
+ * Improve the status info displayed during the kernel postinst, and
+ provide informative/useful messages when things go awry.
+ * Fix bashism in dkms_common.postinst (closes: #581079).
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+Bug-Debian: http://bugs.debian.org/581079
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- dkms-2.1.1.2.orig/dkms.8
++++ dkms-2.1.1.2/dkms.8
+@@ -477,6 +477,9 @@ directives match against the kernel bein
+ will be used to build your module. If no MAKE directive is specified or if no
+ MAKE_MATCH matches the kernel being built for, DKMS
+ will attempt to use a generic MAKE command to build your module.
++
++KERNELRELEASE will be automatically appended to MAKE[#]. If you want to
++suppress this behavior, you can quote the make command: 'make'.
+ .TP
+ .B MAKE_MATCH[#]=
+ See the above entry on
diff --git a/debian/patches/series b/debian/patches/series
index 9191ed9..9561239 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
-# This is empty for now
improved-error-messages.patch
+fix-bashism.patch
+manpage-update.patch
+use-system-tmpdir.patch
diff --git a/debian/patches/use-system-tmpdir.patch b/debian/patches/use-system-tmpdir.patch
new file mode 100644
index 0000000..f35fc2e
--- /dev/null
+++ b/debian/patches/use-system-tmpdir.patch
@@ -0,0 +1,97 @@
+Description: Upstream changes introduced in version 2.1.1.2-3
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ dkms (2.1.1.2-3) UNRELEASED; urgency=low
+ .
+ [ Michael Gilbert ]
+ * Add missing depends on python (needed by dkms.py).
+ * Update to source format 3 (quilt) for better patch management/handling.
+ * Improve the status info displayed during the kernel postinst, and
+ provide informative/useful messages when things go awry.
+ * Fix bashism in dkms_common.postinst (closes: #581079).
+ * Document odd behavior of MAKE[#] (closes: #553625).
+ * Document package naming convention (closes: #571753).
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+Bug-Debian: http://bugs.debian.org/553625
+Bug-Debian: http://bugs.debian.org/571753
+Bug-Debian: http://bugs.debian.org/581079
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- dkms-2.1.1.2.orig/dkms
++++ dkms-2.1.1.2/dkms
+@@ -3592,7 +3592,8 @@ current_kernel=`uname -r`
+ dkms_tree="/var/lib/dkms"
+ source_tree="/usr/src"
+ install_tree="/lib/modules"
+-tmp_location="/tmp"
++tmp_file=`mktemp --tmpdir dkms.XXXXXXXX`
++tmp_location=`dirname $tmp_file`
+ verbose=""
+ dkms_frameworkconf="/etc/dkms/framework.conf"
+
+--- dkms-2.1.1.2.orig/dkms_find-provides
++++ dkms-2.1.1.2/dkms_find-provides
+@@ -59,7 +59,7 @@ get_modinfo() {
+ }
+
+
+-TMPDIR=$(mktemp -d /tmp/dkms-findprovides-$$-$RANDOM-XXXXXX)
++TMPDIR=$(mktemp -d --tmpdir dkms-findprovides-$$-$RANDOM-XXXXXX)
+ trap "rm -rf $TMPDIR >/dev/null 2>&1" QUIT EXIT HUP INT TERM
+
+ modlist=
+--- dkms-2.1.1.2.orig/Makefile
++++ dkms-2.1.1.2/Makefile
+@@ -88,7 +88,7 @@ tarball: $(TARBALL)
+
+ $(TARBALL):
+ mkdir -p $(deb_destdir)
+- tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \
++ tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
+ cp -a ../$(RELEASE_NAME) $${tmp_dir}/$(RELEASE_STRING) ; \
+ sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms > $${tmp_dir}/$(RELEASE_STRING)/dkms ; \
+ sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/$(RELEASE_STRING)/dkms.spec ; \
+@@ -105,7 +105,7 @@ $(TARBALL):
+
+
+ rpm: $(TARBALL) dkms.spec
+- tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \
++ tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
+ mkdir -p $${tmp_dir}/{BUILD,RPMS,SRPMS,SPECS,SOURCES} ; \
+ cp $(TARBALL) $${tmp_dir}/SOURCES ; \
+ sed "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/SPECS/dkms.spec ; \
+@@ -129,7 +129,7 @@ debmagic: $(TARBALL)
+ cd -
+
+ debs:
+- tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \
++ tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
+ make debmagic DEB_TMP_BUILDDIR=$${tmp_dir} DIST=$(DIST); \
+ rm -rf $${tmp_dir}
+
+--- dkms-2.1.1.2.orig/dkms_autoinstaller
++++ dkms-2.1.1.2/dkms_autoinstaller
+@@ -32,7 +32,7 @@ fi
+ invoke_command ()
+ {
+ local exitval=0
+- local exitval_file=`mktemp /tmp/dkms.XXXXXX`
++ local exitval_file=`mktemp --tmpdir dkms.XXXXXX`
+ if [ "$3" = background ] && [ -z "$verbose" ]; then
+ (eval $1 >/dev/null 2>&1; echo "exitval=$?" >> "$exitval_file") &
+ while [ -e "$exitval_file" ] && ! [ -s "$exitval_file" ]; do
--
Dynamic Kernel Module Support
More information about the Pkg-dkms-commits
mailing list