The following commit has been merged in the master branch:
commit 3bdb6c1fdd95a5f713a4e000f8758ddb42fd1145
Author: Giuseppe Iuculano <[email protected]>
Date: Mon Aug 24 11:23:25 2009 +0200
Removed all patches, they are now merged in upstream. Thanks Mario
Limonciello.
diff --git a/debian/patches/01_kernel_postinst.patch
b/debian/patches/01_kernel_postinst.patch
deleted file mode 100644
index 4a20797..0000000
--- a/debian/patches/01_kernel_postinst.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-shut up "which", only the exit code is needed
---- a/kernel_postinst.d_dkms
-+++ b/kernel_postinst.d_dkms
-@@ -4,7 +4,7 @@
- inst_kern=$1
-
- if [ -x /etc/init.d/dkms_autoinstaller ]; then
-- if which invoke-rc.d; then
-+ if which invoke-rc.d >/dev/null 2>&1 ; then
- invoke-rc.d dkms_autoinstaller start $inst_kern
- else
- /etc/init.d/dkms_autoinstaller start $inst_kern
diff --git a/debian/patches/02_dkms.8.patch b/debian/patches/02_dkms.8.patch
deleted file mode 100644
index d19f909..0000000
--- a/debian/patches/02_dkms.8.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix some typos in the man page, thanks A. Costa (Closes: #534662)
---- a/dkms.8
-+++ b/dkms.8
-@@ -298,7 +298,7 @@ combinations on the other kernel.
- .B \-\-force
- This option can be used in conjunction with
- .B ldtarball
--to force copying over of already existant files.
-+to force copying over of extant files.
- .TP
- .B \-\-binaries\-only
- This option can be used in conjunction with
-@@ -391,7 +391,7 @@ Provides a location to place modules whe
- command is issued.
- .TP
- .B \-\-dkmsframework path/to/file
--A supplemental configuration file to the systemwide dkms framework, typically
located
-+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.
- .SH ORIGINAL MODULES
-@@ -620,7 +620,7 @@ is not a "y" or a "Y", it is assumed tha
- This optional directive specifies, if the udev daemon will be get a trigger
event after the module is installed
- for your currently running kernel. Because this udev trigger might have some
unfriendly side effects on some Linux
- Systems, you can now disable this trigger, if your driver does not need it
anyway.
--UDEV_TRIGGER=yes is assumed as the default, although this directive may not
be given. This esures backward compatibility
-+UDEV_TRIGGER=yes is assumed as the default, although this directive may not
be given. This ensures backward compatibility
- to older DKMS releases. Any text after the first character is ignored and if
the first character is not a "n" or a "N",
- it is assumed that UDEV_TRIGGER="yes".
- .TP
-@@ -781,7 +781,7 @@ will be
- option.
- .SH /etc/dkms/framework.conf
- This configuration file controls how the overall DKMS framework handles. It
is sourced
--in everytime the dkms command is run. Mainly it can currently be used to set
different
-+in every time the dkms command is run. Mainly it can currently be used to
set different
- default values for the variables.
- .B $dkms_tree
- ,
diff --git a/debian/patches/08-use-update-initramfs.patch
b/debian/patches/08-use-update-initramfs.patch
deleted file mode 100644
index 4a5ffd6..0000000
--- a/debian/patches/08-use-update-initramfs.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Use update-initramfs, it is the default in Debian/Ubuntu and it also computes
and stores some checksums.
-with update-initramfs no need to check for do_bootloader and lilo.
---- a/dkms
-+++ b/dkms
-@@ -207,23 +207,10 @@ function remake_initrd()
- local exitval="0"
- local mkinitrd='mkinitrd'
-
-- # Support /etc/kernel-img.conf (Debian)
-- if [ -f "/etc/kernel-img.conf" ]; then
-- # we use the first one listed
-- mkinitrd=$(sed -e '/^\s*ramdisk/!d' \
-- -e 's/^\s*ramdisk\s*=\s*\(.*\)/\1/' \
-- -e "s/['\"]*//g" \
-- /etc/kernel-img.conf | \
-- awk '{print $1}')
-- else
-- if type update-initramfs >/dev/null 2>&1; then
-- mkinitrd='update-initramfs'
-- fi
-- fi
-
-- # Support initramfs distributions (Ubuntu).
-- if [ -x "/usr/sbin/mkinitramfs" ]; then
-- mkinitrd='mkinitramfs'
-+ # Support initramfs distributions (Debian/Ubuntu).
-+ if [ -x "/usr/sbin/update-initramfs" ]; then
-+ mkinitrd='update-initramfs'
- fi
-
- $mkinitrd --version >/dev/null 2>&1
-@@ -262,12 +249,10 @@ function remake_initrd()
- echo $"Updating initrd"
- echo $"Making new initrd as $initrd_dir/initrd.img-$1"
- echo $"(If next boot fails, revert to the .bak initrd image)"
-- if [ -f "/etc/initramfs-tools/update-initramfs.conf" ] && \
-- ! ( grep ^update_initramfs
/etc/initramfs-tools/update-initramfs.conf | grep -qi no ) && \
-- [ "$mkinitrd" == "update-initramfs" ]; then
-+ if [ "$mkinitrd" == "update-initramfs" ]; then
- invoke_command "$mkinitrd -u" "$mkinitrd" background
- else
-- echo $"Saving old initrd as $initrd_dir/initrd.img_old-$1"
-+ echo $"Saving old initrd as $initrd_dir/initrd.img-$1.bak"
- # we use the same convention as update-initramfs, so that we
just
- # print the warning once
- cp -f "$initrd_dir/initrd.img-$1"
"$initrd_dir/initrd.img-$1.bak"
-@@ -281,11 +266,6 @@ function remake_initrd()
- exitval="$?"
- fi
-
-- # Rerun lilo if necessary
-- if [ ! -e /etc/kernel-img.conf ] || ( grep ^do_bootloader
/etc/kernel-img.conf | grep -qi yes ) && [ -e /etc/lilo.conf ]; then
-- invoke_command "/sbin/lilo" "Updating lilo"
-- fi
--
- return $exitval
- }
-
diff --git a/debian/patches/15_modprobe.patch b/debian/patches/15_modprobe.patch
deleted file mode 100644
index 201e820..0000000
--- a/debian/patches/15_modprobe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-do not create an empty /etc/modprobe.d/package_name.conf. it is opened and
parsed every time modprobe is run (and it is run very often at boot time).
Create it only if necessary.
---- a/dkms
-+++ b/dkms
-@@ -732,8 +732,6 @@ function moduleconfig_add ()
- [ -e /etc/modprobe.d/$package_name.conf ] &&
modconfig_files="/etc/modprobe.d/$package_name.conf"
-
- if [ -z "$modconfig_files" ]; then
-- touch /etc/modprobe.d/$package_name.conf
-- echo $"created /etc/modprobe.d/$package_name.conf.">&2
- modconfig_files="/etc/modprobe.d/$package_name.conf"
- fi
-
-@@ -764,8 +762,13 @@ function moduleconfig_add ()
-
- # Only add it if it can't be found already in config file
- if [ -n "${modules_conf_alias_type[$index]}" ] && \
-- ! grep -q "alias ${modules_conf_alias_type[$index]}[0-9]*
${dest_module_name[$index]}\b" $moduleconfig && \
-+ ! grep -qs "alias ${modules_conf_alias_type[$index]}[0-9]*
${dest_module_name[$index]}\b" $moduleconfig && \
- [ "${modules_conf_obsolete_only[$index]}" != "yes" ]; then
-+ if [ "$modconfig_files" == "/etc/modprobe.d/$package_name.conf"
] && \
-+ [ ! -e /etc/modprobe.d/$package_name.conf ]; then
-+ touch /etc/modprobe.d/$package_name.conf
-+ echo $"created /etc/modprobe.d/$package_name.conf.">&2
-+ fi
- aliases=$(awk "/^alias ${modules_conf_alias_type[$index]}/
{print \$2}" $moduleconfig)
- if [ -n "$aliases" ]; then
- alias_number=$(($(echo "$aliases" | sed
"s/${modules_conf_alias_type[$index]}//" | sort -n | tail -n 1) + 1))
diff --git a/debian/patches/16_old_module.patch
b/debian/patches/16_old_module.patch
deleted file mode 100644
index 5c6b609..0000000
--- a/debian/patches/16_old_module.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Do not move away the old module, by default dkms install the new one in
/lib/modules/<kernelversion>/updates/dkms (Closes: #529059)
---- a/dkms
-+++ b/dkms
-@@ -1234,11 +1234,16 @@ function install_module()
- local found_orginal=""
- for original_module in $archive_pref1 $archive_pref2 $archive_pref3
$archive_pref4; do
- if [ -f "$original_module" ]; then
-- echo $" - Found $original_module"
-- echo $" - Storing in
$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/"
-- echo $" - Archiving for uninstallation purposes"
-- mkdir -p
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}"
-- mv -f "$original_module"
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/"
-+ case "$running_distribution" in
-+ Debian* | Ubuntu* ) ;;
-+ *)
-+ echo $" - Found $original_module"
-+ echo $" - Storing in
$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/"
-+ echo $" - Archiving for uninstallation purposes"
-+ mkdir -p
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}"
-+ mv -f "$original_module"
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/"
-+ ;;
-+ esac
- found_original="yes"
- break
- fi
-@@ -1258,13 +1263,23 @@ function install_module()
- if [ "$module_count" -gt 1 ]; then
- echo $" - Multiple same named modules!"
- echo $" - $module_count named
${dest_module_name[$count]}$module_suffix in $lib_tree/"
-- echo $" - All instances of this module will now be stored for
reference purposes ONLY"
-- echo $" - Storing in
$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/collisions/"
-+ case "$running_distribution" in
-+ Debian* | Ubuntu* ) ;;
-+ *)
-+ echo $" - All instances of this module will now be stored
for reference purposes ONLY"
-+ echo $" - Storing in
$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/collisions/"
-+ ;;
-+ esac
- for module_dup in `find $lib_tree -name
${dest_module_name[$count]}$module_suffix -type f`; do
- dup_tree=`echo $module_dup | sed "s#^$lib_tree##" | sed
"s#${dest_module_name[$count]}$module_suffix##"`
-- echo $" - Stored $module_dup"
-- mkdir -p
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/collisions/$dup_tree"
-- mv -f $module_dup
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/collisions/$dup_tree"
-+ case "$running_distribution" in
-+ Debian* | Ubuntu* ) ;;
-+ *)
-+ echo $" - Stored $module_dup"
-+ mkdir -p
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/collisions/$dup_tree"
-+ mv -f $module_dup
"$dkms_tree/$module/original_module/${kernelver_array[0]}/${arch_array[0]}/collisions/$dup_tree"
-+ ;;
-+ esac
- done
- fi
-
-@@ -1605,10 +1620,16 @@ function do_uninstall()
- rm -f
"$install_tree/$1${real_dest_module_location}/${dest_module_name[$count]}$module_suffix"
- echo $" - Original module"
- if [ -e
"$dkms_tree/$module/original_module/$1/$2/${dest_module_name[$count]}$module_suffix"
]; then
-- echo $" - Archived original module found in the DKMS tree"
-- echo $" - Moving it to:
$install_tree/$1${DEST_MODULE_LOCATION[$count]}/"
-- mkdir -p "$install_tree/$1${DEST_MODULE_LOCATION[$count]}/"
-- mv -f
"$dkms_tree/$module/original_module/$1/$2/${dest_module_name[$count]}$module_suffix"
"$install_tree/$1${DEST_MODULE_LOCATION[$count]}/" 2>/dev/null
-+ case "$running_distribution" in
-+ Debian* | Ubuntu* ) ;;
-+ *)
-+ echo $" - Archived original module found in the DKMS
tree"
-+ echo $" - Moving it to:
$install_tree/$1${DEST_MODULE_LOCATION[$count]}/"
-+ mkdir -p
"$install_tree/$1${DEST_MODULE_LOCATION[$count]}/"
-+ mv -f
"$dkms_tree/$module/original_module/$1/$2/${dest_module_name[$count]}$module_suffix"
\
-+ "$install_tree/$1${DEST_MODULE_LOCATION[$count]}/"
2>/dev/null
-+ ;;
-+ esac
- else
- echo $" - No original module was found for this module on
this kernel."
- echo $" - Use the dkms install command to reinstall any
previous module version."
--
Maintainance of the dkms package
_______________________________________________
Pkg-dkms-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-dkms-commits
