[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-6-4-gc552af9
Giuseppe Iuculano
iuculano at debian.org
Fri Jul 15 10:44:51 UTC 2011
The following commit has been merged in the master branch:
commit 2a56b4e039d0ff9497ac39f6a2e7a0b35eb7d883
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Fri Jul 15 12:39:57 2011 +0200
Refreshed and removed patches merged upstream.
diff --git a/debian/patches/debian-lsb.patch b/debian/patches/debian-lsb.patch
index af4fbee..4813ffb 100644
--- a/debian/patches/debian-lsb.patch
+++ b/debian/patches/debian-lsb.patch
@@ -3,18 +3,17 @@ Do not use lsb_release to determine the distribution, add a a static assignment
This patch should not be merged upstream
--- a/dkms
+++ b/dkms
-@@ -363,10 +363,10 @@ function distro_version()
+@@ -341,9 +341,10 @@ distro_version()
+ # try the LSB-provided strings first
if [ -r /etc/lsb-release ]; then
- . /etc/lsb-release
- LSB_RELEASE=1
+ . /etc/lsb-release
- elif type lsb_release >/dev/null 2>&1; then
-- DISTRIB_ID=$(lsb_release -i -s)
-- DISTRIB_RELEASE=$(lsb_release -r -s)
-- LSB_RELEASE=1
+- DISTRIB_ID=$(lsb_release -i -s)
+- DISTRIB_RELEASE=$(lsb_release -r -s)
+ else
-+ DISTRIB_ID=Debian
-+ DISTRIB_RELEASE=$(cat /etc/debian_version)
-+ LSB_RELEASE=1
++ DISTRIB_ID=Debian
++ DISTRIB_RELEASE=$(cat /etc/debian_version)
++ LSB_RELEASE=1
fi
- case "${DISTRIB_ID}" in
+ case ${DISTRIB_ID} in
diff --git a/debian/patches/fix-bashism.patch b/debian/patches/fix-bashism.patch
deleted file mode 100644
index da7f6af..0000000
--- a/debian/patches/fix-bashism.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/framework_conf.patch b/debian/patches/framework_conf.patch
deleted file mode 100644
index e97a0f4..0000000
--- a/debian/patches/framework_conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Do not return error if /etc/dkms/framework.conf is missing
---- a/dkms_autoinstaller
-+++ b/dkms_autoinstaller
-@@ -53,7 +53,7 @@ uname=`uname -mr`
- arch=${uname#* }
- kernel_preparation_done=""
- dkms_tree="/var/lib/dkms"
--. /etc/dkms/framework.conf 2>/dev/null
-+[ -e /etc/dkms/framework.conf ] && . /etc/dkms/framework.conf 2>/dev/null
-
- # See how we were called.
- case "$1" in
diff --git a/debian/patches/improve-the-logic-behind-kernels-detection.patch b/debian/patches/improve-the-logic-behind-kernels-detection.patch
deleted file mode 100644
index d54791e..0000000
--- a/debian/patches/improve-the-logic-behind-kernels-detection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Improve the logic behind kernels detection.
-
-Before using the current kernel we need to make sure that this
-kernel doesn't belong to the host of a chroot and we should also
-be more careful when adding kernels to the candidates list.
-Index: dkms-2.1.1.2/dkms_common.postinst
-===================================================================
---- dkms-2.1.1.2.orig/dkms_common.postinst 2010-09-23 18:56:55.119898998 +0200
-+++ dkms-2.1.1.2/dkms_common.postinst 2010-09-23 18:58:03.579898998 +0200
-@@ -188,13 +188,26 @@
- # current kernel.
- NEWEST_KERNEL=$(get_newest_kernel "$KERNELS")
-
--if [ -n "$NEWEST_KERNEL" ] && [ ${CURRENT_KERNEL} != ${NEWEST_KERNEL} ]; then
-- echo "Building for $CURRENT_KERNEL and $NEWEST_KERNEL"
-- KERNELS="$KERNELS $NEWEST_KERNEL"
-+# If the current kernel doesn't come from the host of a chroot
-+if [ `_is_kernel_name_correct $CURRENT_KERNEL` = "yes" ]; then
-+ # See if it's worth building the module for both the newest kernel
-+ # and for the current kernel
-+ if [ -n "$NEWEST_KERNEL" ] && [ ${CURRENT_KERNEL} != ${NEWEST_KERNEL} ]; then
-+ echo "Building for $CURRENT_KERNEL and $NEWEST_KERNEL"
-+ KERNELS="$CURRENT_KERNEL $NEWEST_KERNEL"
-+ else
-+ echo "Building only for $CURRENT_KERNEL"
-+ fi
-+# The current kernel is not useful as it's the host's
- else
-- echo "Building only for $CURRENT_KERNEL"
--fi
-+ echo "It is likely that $CURRENT_KERNEL belongs to a chroot's host"
-
-+ # Let's use only the newest kernel
-+ if [ -n "$NEWEST_KERNEL" ]; then
-+ KERNELS="$NEWEST_KERNEL"
-+ echo "Building only for $NEWEST_KERNEL"
-+ fi
-+fi
-
- if [ -n "$ARCH" ]; then
- if which lsb_release >/dev/null && [ $(lsb_release -s -i) = "Ubuntu" ]; then
diff --git a/debian/patches/improved-error-messages.patch b/debian/patches/improved-error-messages.patch
index 60ec539..619d626 100644
--- a/debian/patches/improved-error-messages.patch
+++ b/debian/patches/improved-error-messages.patch
@@ -1,9 +1,9 @@
Description: Improve kernel postinst status information.
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
---- dkms-2.1.1.2.orig/kernel_postinst.d_dkms
-+++ dkms-2.1.1.2/kernel_postinst.d_dkms
-@@ -4,5 +4,10 @@
- inst_kern=$1
+--- a/kernel_postinst.d_dkms
++++ b/kernel_postinst.d_dkms
+@@ -36,7 +36,12 @@ case "${uname_s}" in
+ esac
if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then
- exec /usr/lib/dkms/dkms_autoinstaller start $inst_kern > /dev/null
@@ -14,45 +14,5 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+ echo "dkms: WARNING: linux headers are missing, which may explain the above failures." >&2
+ echo " please install the linux-headers-$inst_kern package to fix this." >&2
fi
---- dkms-2.1.1.2.orig/kernel_prerm.d_dkms
-+++ dkms-2.1.1.2/kernel_prerm.d_dkms
-@@ -8,7 +8,7 @@ while read line; do
- name=`echo "$line" | awk '{print $1}' | sed 's/,$//'`
- vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'`
- arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'`
-- echo "Uninstalling: $name $vers ($inst_kern) ($arch)"
-+ echo "dkms: uninstalling: $name $vers ($inst_kern) ($arch)" >&2
- dkms uninstall -m $name -v $vers -k $inst_kern -a $arch
- done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
- fi
---- dkms-2.1.1.2.orig/dkms_autoinstaller
-+++ dkms-2.1.1.2/dkms_autoinstaller
-@@ -58,7 +58,8 @@ dkms_tree="/var/lib/dkms"
- # See how we were called.
- case "$1" in
- start)
-- log_daemon_msg "Running DKMS auto installation service for kernel $kernel"
-+ log_daemon_msg "dkms: running auto installation service for kernel $kernel"
-+ echo ""
-
- if [ -z "$kernel" ]; then
- if [ -L /vmlinuz -a -e /vmlinuz ]; then
-@@ -96,7 +97,7 @@ case "$1" in
- [ "$current_state" = "installed" -o "$current_state" = "installed-weak" ] && already_installed="true" && already_installed_version=$version_in_tree
- done
-
-- log_action_begin_msg " $module_in_tree ($version_in_tree)"
-+ log_action_begin_msg " $module_in_tree ($version_in_tree)"
- # Based on what we know, either do it or not
- if [ "$current_state" = "broken" ]; then
-@@ -147,9 +148,6 @@ case "$1" in
- fi
- fi
- done
-- if [ -z "$modules_needing_status" ]; then
-- log_end_msg 0
-- fi
- ;;
- stop|restart|force-reload|status|reload)
- # ignore
+ if ! _check_kernel_dir $inst_kern ; then
diff --git a/debian/patches/make-logging-fix.patch b/debian/patches/make-logging-fix.patch
deleted file mode 100644
index b4aba3d..0000000
--- a/debian/patches/make-logging-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Improved logging for compound make statements
-Author: Anders Kaseorg <andersk at mit.edu>
-Bug-Debian: http://bugs.debian.org/577972
-Index: dkms-2.1.1.2/dkms
-===================================================================
---- dkms-2.1.1.2.orig/dkms 2010-08-18 00:10:16.000000000 -0400
-+++ dkms-2.1.1.2/dkms 2010-08-18 00:12:58.000000000 -0400
-@@ -25,14 +25,14 @@
- local exitval_file=`mktemp $tmp_location/dkms.XXXXXX`
- [ -z "$verbose" ] && echo -en "$2..." || echo -e "$1"
- if [ "$3" == background ] && [ -z "$verbose" ]; then
-- (eval $1 >/dev/null 2>&1; echo "exitval=$?" >> "$exitval_file") &
-+ (eval "$1" >/dev/null 2>&1; echo "exitval=$?" >> "$exitval_file") &
- while [ -e "$exitval_file" ] && ! [ -s "$exitval_file" ]; do
- sleep 3
- echo -en "."
- done
- . "$exitval_file"
- else
-- eval $1; exitval=$?
-+ eval "$1"; exitval=$?
- fi
- [ $exitval -gt 0 ] && echo -en "(bad exit status: $exitval)"
- rm -f "$exitval_file"
-@@ -1524,7 +1524,7 @@
- echo $"`date`" >> "$dkms_tree/$module/$module_version/build/make.log"
- local the_make_command=`echo $make_command | sed "s/^make/make KERNELRELEASE=${kernelver_array[0]}/"`
-
-- invoke_command "$the_make_command >> $dkms_tree/$module/$module_version/build/make.log 2>&1" "$the_make_command" background
-+ invoke_command "{ $the_make_command; } >> $dkms_tree/$module/$module_version/build/make.log 2>&1" "$the_make_command" background
-
- # Make sure good return status
- if [ "$?" -ne 0 ]; then
diff --git a/debian/patches/manpage-update.patch b/debian/patches/manpage-update.patch
deleted file mode 100644
index da2f748..0000000
--- a/debian/patches/manpage-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Document MAKE[#] behavior
---- 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/mkdeb.patch b/debian/patches/mkdeb.patch
deleted file mode 100644
index 4eebe3d..0000000
--- a/debian/patches/mkdeb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Check for debhelper installation when using 'dkms mkdeb'
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
-Bug-Debian: http://bugs.debian.org/592863
---- dkms-2.1.1.2.orig/dkms
-+++ dkms-2.1.1.2/dkms
-@@ -3250,6 +3250,12 @@ function make_debian_test_depends()
- if ! which dpkg-buildpackage >/dev/null 2>&1 ; then
- INSTALL_PACKAGES="dpkg-dev $INSTALL_PACKAGES"
- fi
-+
-+ # Check whether debhelper commands are present
-+ if ! which dh_testdir >/dev/null 2>&1 ; then
-+ INSTALL_PACKAGES="debhelper $INSTALL_PACKAGES"
-+ fi
-+
- echo "$INSTALL_PACKAGES"
- }
-
diff --git a/debian/patches/mkdsc.patch b/debian/patches/mkdsc.patch
deleted file mode 100644
index 14ac28b..0000000
--- a/debian/patches/mkdsc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 55321c5537c963206d51c9965aa7816c7a5dfef0 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson at canonical.com>
-Date: Fri, 30 Jul 2010 12:43:48 +0200
-Subject: [PATCH] Copy from the right directory with mkdsc
-
-Signed-off-by: David Henningsson <david.henningsson at canonical.com>
----
- dkms | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-From 469f8cc9d9db1390c5ce43fb839240c1538491bc Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson at canonical.com>
-Date: Fri, 30 Jul 2010 13:15:28 +0200
-Subject: [PATCH 2/2] Also copy source.changes when building with mkdsc
-
-Signed-off-by: David Henningsson <david.henningsson at canonical.com>
----
- dkms | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
---- a/dkms
-+++ b/dkms
-@@ -3390,7 +3390,8 @@ function make_debian()
- echo $"Error! There was a problem creating your ${create_type}." >&2
- exit 7
- fi
-- invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir"
-+ package_prefix="$temp_dir/${debian_package}-dkms_${module_version}"
-+ invoke_command "mv '${package_prefix}.dsc' '${package_prefix}_source.changes' '${package_prefix}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir"
- ;;
- deb)
- invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package"
-@@ -3410,7 +3411,7 @@ function make_debian()
-
- if in_temporary_trees; then
- echo "Copying built files to "`pwd`"/.." >&2
-- cp "$dkms_tree/$module/$module_version/deb/"* ..
-+ cp "${deb_basedir}/"* ..
- fi
-
- #cleanup
diff --git a/debian/patches/remove-old-mod.patch b/debian/patches/remove-old-mod.patch
deleted file mode 100644
index 25f8e41..0000000
--- a/debian/patches/remove-old-mod.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-When removing a kernel it would be good to remove all the modules and not just uninstall them.
-Issuing a remove instead of an uninstall to dkms will cause the module to be uninstalled first
-(if it's not already), then removed. If the kernel is ever re-installed then dkims will
-rebuild the module as needed, so nothing is lost by removing the modules for a
-reomoved kernel, but you do run a cleaner system.
-
---- a/kernel_prerm.d_dkms
-+++ b/kernel_prerm.d_dkms
-@@ -8,8 +8,8 @@ while read line; do
- name=`echo "$line" | awk '{print $1}' | sed 's/,$//'`
- vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'`
- arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'`
-- echo "dkms: uninstalling: $name $vers ($inst_kern) ($arch)" >&2
-- dkms uninstall -m $name -v $vers -k $inst_kern -a $arch
-+ echo "dkms: removing: $name $vers ($inst_kern) ($arch)" >&2
-+ dkms remove -m $name -v $vers -k $inst_kern -a $arch
- done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
- fi
-
diff --git a/debian/patches/series b/debian/patches/series
index e28e159..686e575 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,2 @@
improved-error-messages.patch
-fix-bashism.patch
-manpage-update.patch
-use-system-tmpdir.patch
-remove-old-mod.patch
-skip-non-matching-kernel.patch
debian-lsb.patch
-framework_conf.patch
-mkdsc.patch
-make-logging-fix.patch
-mkdeb.patch
-improve-the-logic-behind-kernels-detection.patch
diff --git a/debian/patches/skip-non-matching-kernel.patch b/debian/patches/skip-non-matching-kernel.patch
deleted file mode 100644
index c9cb544..0000000
--- a/debian/patches/skip-non-matching-kernel.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-dkms.conf allows to set a BUILD_EXCLUSIVE_KERNEL / BUILD_EXCLUSIVE_ARCH
-parameter to specify a regular expression which defines the subset of
-kernels / architectures which DKMS is allowed to build the module for. If
-the kernel being built for does not match against this regular
-expressions, the dkms build will error out with exit code 9.
-
-This patch changes dkms_common.postinst to handle this dkms build
-error gracefully by skipping build for the non matching kernels.
---- a/dkms_common.postinst
-+++ b/dkms_common.postinst
-@@ -231,8 +231,22 @@ for KERNEL in $KERNELS; do
- fi
- if [ -e /lib/modules/$KERNEL/build/include ]; then
- echo "Building initial module for $KERNEL"
-+ set +e
- dkms build -m $NAME -v $VERSION -k $KERNEL $ARCH > /dev/null
-- echo "Done."
-+ case $? in
-+ 9)
-+ set -e
-+ echo "Skipped."
-+ continue
-+ ;;
-+ 0)
-+ set -e
-+ echo "Done."
-+ ;;
-+ *)
-+ exit $?
-+ ;;
-+ esac
- dkms_status=`dkms status -m $NAME -v $VERSION -k $KERNEL $ARCH`
- else
- echo "Module build for the currently running kernel was skipped since the"
diff --git a/debian/patches/use-system-tmpdir.patch b/debian/patches/use-system-tmpdir.patch
deleted file mode 100644
index 7e38dee..0000000
--- a/debian/patches/use-system-tmpdir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Use system setting for tmpdir
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
---- 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