$ git diff --patch-with-stat --summary 08c7653b623f7401d0b5d05bc42a389549a8ae48..3d7ab783743702df93f3050446a2ba3c9a006f0a
.abf.yml | 2 +-
dkms-2.0.19-mdkrpm-split-ver-rel.patch | 16 --
dkms-2.2.0.3-compressed-module.patch | 32 ----
....2.0.3-dont_fail_if_module_source_removed.patch | 24 ---
dkms-2.2.0.3-fix_obsolete_modules_check.patch | 30 ---
...generic-preparation-for-2.6.39-and-higher.patch | 11 --
dkms-2.2.0.3-init-mdv-interactive.patch | 10 -
dkms-2.2.0.3-mdkize.patch | 204 ---------------------
dkms-2.2.0.3-min-max-kernel.patch | 29 ---
dkms-2.2.0.3-mkrpm_status.patch | 17 --
dkms-2.2.0.3-parallel-build.patch | 73 --------
dkms-2.2.0.3-parallel_fix.patch | 17 --
dkms-2.2.0.3-procconfig.patch | 55 ------
dkms-2.2.0.3-suggest-devel-not-source.patch | 22 ---
dkms-2.2.0.3-xz-support.patch | 84 ---------
...add-dependency-logic-for-automatic-builds.patch | 110 -----------
dkms-2.2.0.3.1-xz-support.patch | 84 ---------
dkms-2.2.0.3.1.tar.xz | Bin 0 -> 73240 bytes
...3-autoalias.patch => dkms-2.6.1-autoalias.patch | 43 ++---
...nary_only.patch => dkms-2.6.1-binary_only.patch | 18 +-
...-2.6.1-dont_fail_if_module_source_removed.patch | 13 ++
...generic-preparation-for-2.6.39-and-higher.patch | 11 ++
dkms-2.6.1-mdkize.patch | 81 ++++++++
....patch => dkms-2.6.1-mdkrpm-split-ver-rel.patch | 14 +-
dkms-2.6.1-min-max-kernel.patch | 30 +++
dkms-2.6.1-mkrpm_status.patch | 17 ++
dkms-2.6.1-parallel-build.patch | 81 ++++++++
dkms-2.6.1-parallel_fix.patch | 17 ++
...procconfig.patch => dkms-2.6.1-procconfig.patch | 40 ++--
dkms-2.6.1-suggest-devel-not-source.patch | 11 ++
...2.0.3-symvers.patch => dkms-2.6.1-symvers.patch | 16 +-
dkms-cleanup-after-removal.patch | 32 ++--
dkms-do-not-fail-on-modules-dir.patch | 17 --
...-autoinstall-failures-for-kernel-upgrades.patch | 83 ---------
dkms-man.patch | 46 -----
dkms-reset-build-dependencies.patch | 32 ----
...TRIP-0-as-the-default-for-the-STRIP-array.patch | 40 ----
...-bb.2018-08-12-18-33-17.08679.itchka64.buildlog | 195 ++++++++++++++++++++
dkms.spec | 57 ++----
39 files changed, 552 insertions(+), 1162 deletions(-)
delete mode 100644 dkms-2.0.19-mdkrpm-split-ver-rel.patch
delete mode 100644 dkms-2.2.0.3-compressed-module.patch
delete mode 100644 dkms-2.2.0.3-dont_fail_if_module_source_removed.patch
delete mode 100644 dkms-2.2.0.3-fix_obsolete_modules_check.patch
delete mode 100644 dkms-2.2.0.3-generic-preparation-for-2.6.39-and-higher.patch
delete mode 100644 dkms-2.2.0.3-init-mdv-interactive.patch
delete mode 100644 dkms-2.2.0.3-mdkize.patch
delete mode 100644 dkms-2.2.0.3-min-max-kernel.patch
delete mode 100644 dkms-2.2.0.3-mkrpm_status.patch
delete mode 100644 dkms-2.2.0.3-parallel-build.patch
delete mode 100644 dkms-2.2.0.3-parallel_fix.patch
delete mode 100644 dkms-2.2.0.3-procconfig.patch
delete mode 100644 dkms-2.2.0.3-suggest-devel-not-source.patch
delete mode 100644 dkms-2.2.0.3-xz-support.patch
delete mode 100644 dkms-2.2.0.3.1-add-dependency-logic-for-automatic-builds.patch
delete mode 100644 dkms-2.2.0.3.1-xz-support.patch
create mode 100644 dkms-2.2.0.3.1.tar.xz
rename dkms-2.2.0.3-autoalias.patch => dkms-2.6.1-autoalias.patch (51%)
rename dkms-2.2.0.3-binary_only.patch => dkms-2.6.1-binary_only.patch (55%)
create mode 100644 dkms-2.6.1-dont_fail_if_module_source_removed.patch
create mode 100644 dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch
create mode 100644 dkms-2.6.1-mdkize.patch
rename dkms-2.2.0.3-mdkrpm-split-ver-rel.patch => dkms-2.6.1-mdkrpm-split-ver-rel.patch (70%)
create mode 100644 dkms-2.6.1-min-max-kernel.patch
create mode 100644 dkms-2.6.1-mkrpm_status.patch
create mode 100644 dkms-2.6.1-parallel-build.patch
create mode 100644 dkms-2.6.1-parallel_fix.patch
rename dkms-2.0.19-procconfig.patch => dkms-2.6.1-procconfig.patch (64%)
create mode 100644 dkms-2.6.1-suggest-devel-not-source.patch
rename dkms-2.2.0.3-symvers.patch => dkms-2.6.1-symvers.patch (58%)
delete mode 100644 dkms-do-not-fail-on-modules-dir.patch
delete mode 100644 dkms-fix-zfs-autoinstall-failures-for-kernel-upgrades.patch
delete mode 100644 dkms-man.patch
delete mode 100644 dkms-reset-build-dependencies.patch
delete mode 100644 dkms-use-STRIP-0-as-the-default-for-the-STRIP-array.patch
create mode 100644 dkms.-bb.2018-08-12-18-33-17.08679.itchka64.buildlog
diff --git a/.abf.yml b/.abf.yml
index ac5a587..ae3a4ee 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- dkms-2.2.0.3.1.tar.xz: 97f69a47593c4baa4b2323d5eafcf06cf24b49ac
+ dkms-2.6.1.tar.gz: 9cdfecc29116d578e693cf3273ea9695d9471cf2
diff --git a/dkms-2.0.19-mdkrpm-split-ver-rel.patch b/dkms-2.0.19-mdkrpm-split-ver-rel.patch
deleted file mode 100644
index e53d10c..0000000
--- a/dkms-2.0.19-mdkrpm-split-ver-rel.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -p -up dkms-2.0.19/dkms.mdkrpm-split-ver-rel dkms-2.0.19/dkms
---- dkms-2.0.19/dkms.mdkrpm-split-ver-rel 2008-04-01 18:28:53.000000000 +0200
-+++ dkms-2.0.19/dkms 2008-04-01 18:31:54.000000000 +0200
-@@ -2935,7 +2935,11 @@ make_rpm()
- trap 'rm -rf $temp_dir_name' EXIT HUP TERM
- mkdir -p ${temp_dir_name}/{BUILD,RPMS,SRPMS,SPECS,SOURCES}
- cp ${SPECFILE} ${temp_dir_name}/SPECS/dkms_mkrpm.spec
-- invoke_command "LC_ALL=C rpmbuild --define \"_topdir ${temp_dir_name}\" --define \"version $module_version\" --define \"module_name $module\" --define \"kernel_versions ${kernelver_array[*]}\" --define \"mktarball_line $mktarball_line\" --define \"__find_provides /usr/lib/dkms/find-provides\" --define \"_use_internal_dependency_generator 0\" -ba ${temp_dir_name}/SPECS/dkms_mkrpm.spec > ${temp_dir_name}/rpmbuild.log 2>&1" "rpmbuild"
-+ if [ "${module_version%-*}" != "${module_version##*-}" ]; then
-+ local module_release="${module_version##*-}"
-+ local module_version="${module_version%-*}"
-+ fi
-+ invoke_command "LC_ALL=C rpmbuild --define \"_topdir ${temp_dir_name}\" --define \"version $module_version\" ${module_release:+--define \"rel $module_release\"} --define \"module_name $module\" --define \"kernel_versions ${kernelver_array[*]}\" --define \"mktarball_line $mktarball_line\" --define \"__find_provides /usr/lib/dkms/find-provides\" --define \"_use_internal_dependency_generator 0\" -ba ${temp_dir_name}/SPECS/dkms_mkrpm.spec > ${temp_dir_name}/rpmbuild.log 2>&1" "rpmbuild"
- if [ "$?" -eq 0 ]; then
- mkdir -p ${rpm_basedir}
- cp -a ${temp_dir_name}/SRPMS/* ${temp_dir_name}/RPMS/*/* ${rpm_basedir}/
diff --git a/dkms-2.2.0.3-compressed-module.patch b/dkms-2.2.0.3-compressed-module.patch
deleted file mode 100644
index 0aec681..0000000
--- a/dkms-2.2.0.3-compressed-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- dkms-2.2.0.3/dkms.compressed-module 2013-05-24 20:36:53.627876061 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 20:38:55.794465350 +0200
-@@ -152,6 +152,10 @@ set_module_suffix()
- kernel_test="${1-:$(uname -r)}"
- module_suffix=".ko"
- [[ $(VER $kernel_test) < $(VER 2.5) ]] && module_suffix=".o"
-+ grep -q '\.gz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && gz_modules=1
-+ if [ -n "$gz_modules" ]; then
-+ [ -z "$delayed_gzip" ] && module_suffix=${module_suffix}.gz
-+ fi
- }
-
- set_kernel_source_dir()
-@@ -1262,6 +1266,9 @@ do_build()
- cp -f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_suffix" "$base_dir/module/${dest_module_name[$count]}$module_suffix" >/dev/null
- done
-
-+ if [ -n "$gz_modules" ]; then
-+ gzip -9f $dkms_tree/$module/$module_version/${kernelver_array[0]}/${arch_array[0]}/module/${dest_module_name[$count]}$module_suffix
-+ fi
- # Run the post_build script
- run_build_script post_build "$post_build"
- }
-@@ -3528,7 +3535,7 @@ for action_to_run in $action; do
- match) check_root && have_one_kernel && run_match;;
- uninstall) check_root && have_one_kernel && uninstall_module;;
- mkdriverdisk) check_root && make_driver_disk;;
-- build) build_modules;;
-+ build) delayed_gzip=1 && build_modules;;
- add) add_module;;
- mktarball) make_tarball;;
- mkrpm) make_rpm;;
diff --git a/dkms-2.2.0.3-dont_fail_if_module_source_removed.patch b/dkms-2.2.0.3-dont_fail_if_module_source_removed.patch
deleted file mode 100644
index ee07cbb..0000000
--- a/dkms-2.2.0.3-dont_fail_if_module_source_removed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru dkms-2.2.0.3.orig/dkms dkms-2.2.0.3/dkms
---- dkms-2.2.0.3.orig/dkms 2013-04-04 16:57:08.987698428 +0200
-+++ dkms-2.2.0.3/dkms 2013-04-13 14:19:14.182300156 +0200
-@@ -455,8 +455,11 @@
- [[ $conf ]] && read_conf_file="$conf"
- [[ $3 ]] && read_conf_file="$3"
-
-+ [[ ! -r $read_conf_file && -r $dkms_tree/$module/$module_version/build/dkms.conf ]] && \
-+ read_conf_file="$dkms_tree/$module/$module_version/build/dkms.conf"
-+
- [[ -r $read_conf_file ]] || die 4 $"Could not locate dkms.conf file." \
-- $"File: $conf does not exist."
-+ $"File: $read_conf_file does not exist."
-
- [[ $last_mvka = $module/$module_version/$1/$2 && \
- $last_mvka_conf = $(readlink -f $read_conf_file) ]] && return
-@@ -1436,6 +1439,7 @@
- is_module_added() {
- [[ $1 && $2 ]] || return 1
- [[ -d $dkms_tree/$1/$2 ]] || return 2
-+ [[ -d $dkms_tree/$1/$2/source/ ]] || return 2
- [[ -L $dkms_tree/$1/$2/source || -d $dkms_tree/$1/$2/source ]];
- }
-
diff --git a/dkms-2.2.0.3-fix_obsolete_modules_check.patch b/dkms-2.2.0.3-fix_obsolete_modules_check.patch
deleted file mode 100644
index 509f176..0000000
--- a/dkms-2.2.0.3-fix_obsolete_modules_check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7a8f0cbfcf594c20e2bd2dfc4c1871aff93663e3 Mon Sep 17 00:00:00 2001
-From: Gaudenz Steinlin <gaudenz.steinlin@cirrax.com>
-Date: Mon, 18 Aug 2014 16:30:55 +0200
-Subject: Fix check for obsolete modules
-
-The check did not work as the array modules_conf_obsoletes array may
-contain elements even if there are no obsoleted modules. This is due to
-how the array is initialized. It's always as large as the largest of the
-configuration arrays defined in dkms.conf.
-
-This fix does a string comparison instead. If no osbsolete module is
-defined, then the expansion of the whole array to a string is always
-empty. For some reason [[ -n ${{modules_conf_obsoletes[@]} ]] does not
-work here.
-
-diff --git a/dkms b/dkms
-index 12c6318..883a650 100644
---- a/dkms
-+++ b/dkms
-@@ -751,7 +751,7 @@ moduleconfig_update_obsoletes()
- {
- # $@ = files to process
- # do nothing if we have no obsoletes
-- [[ ${modules_conf_obsoletes[@]} ]] || return 0
-+ [[ "${modules_conf_obsoletes[@]}" == "" ]] || return 0
- # generate sed args to remove obsolete modules
- local mod_diff
- for ((index=0; index < ${#dest_module_name[@]}; index++)); do
---
-cgit v0.10
diff --git a/dkms-2.2.0.3-generic-preparation-for-2.6.39-and-higher.patch b/dkms-2.2.0.3-generic-preparation-for-2.6.39-and-higher.patch
deleted file mode 100644
index bbc9a4b..0000000
--- a/dkms-2.2.0.3-generic-preparation-for-2.6.39-and-higher.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dkms-2.2.0.3/dkms.generic-prepare 2013-05-24 23:17:20.989522146 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 23:17:39.997794056 +0200
-@@ -1059,7 +1059,7 @@ prepare_kernel()
- if [[ (! ( $(VER $1) < $(VER 2.6.5) ) || -d /etc/SuSEconfig) && \
- -d "$kernel_source_dir" && \
- -z "$ksourcedir_fromcli" ]]; then
-- ! -L "$kernel_source_dir" && \
-+ [[ ($(VER $1) > $(VER 2.6.38) || ! -L "$kernel_source_dir") ]] && \
- echo $""
- echo $"Kernel preparation unnecessary for this kernel. Skipping..."
- no_clean_kernel="no-clean-kernel"
diff --git a/dkms-2.2.0.3-init-mdv-interactive.patch b/dkms-2.2.0.3-init-mdv-interactive.patch
deleted file mode 100644
index 087c269..0000000
--- a/dkms-2.2.0.3-init-mdv-interactive.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dkms-2.2.0.3/dkms_autoinstaller.mdv-interactive 2013-05-24 22:50:31.884444026 +0200
-+++ dkms-2.2.0.3/dkms_autoinstaller 2013-05-24 22:50:48.466684369 +0200
-@@ -7,6 +7,7 @@
- #
- ### BEGIN INIT INFO
- # Provides: dkms_autoinstaller dkms
-+# X-Mandriva-Interactive
- # Default-Start: 2 3 4 5
- # Default-Stop:
- # Required-Start: $local_fs
diff --git a/dkms-2.2.0.3-mdkize.patch b/dkms-2.2.0.3-mdkize.patch
deleted file mode 100644
index 5f9c96f..0000000
--- a/dkms-2.2.0.3-mdkize.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- dkms-2.2.0.3/dkms.mdkize 2011-12-07 19:23:58.000000000 +0100
-+++ dkms-2.2.0.3/dkms 2013-05-24 20:35:08.833477108 +0200
-@@ -823,6 +823,16 @@ moduleconfig_add()
- done
- done
-
-+ if [ -d /etc/modprobe.d ]; then
-+ local index=0
-+ while [ $index -lt ${#dest_module_name[@]} ]; do
-+ if [ "${modules_conf_extract_aliases[$index]}" = yes -a -f $install_tree/${kernelver_array[0]}${dest_module_location[$index]}/${dest_module_name[$index]}$module_suffix ]; then
-+ modinfo $install_tree/${kernelver_array[0]}${dest_module_location[$index]}/${dest_module_name[$index]}$module_suffix | sed -n -e "s/alias:\(.*\)$/alias \1 ${dest_module_name[$index]}/p" > /etc/modprobe.d/dkms-aliases-${dest_module_name[$index]}
-+ fi
-+ index=$(($index+1))
-+ done
-+ fi
-+
- # Delete the temp dir
- rm -rf $temp_dir_name
- }
-@@ -1027,6 +1037,7 @@ prepare_kernel()
- if [[ (! ( $(VER $1) < $(VER 2.6.5) ) || -d /etc/SuSEconfig) && \
- -d "$kernel_source_dir" && \
- -z "$ksourcedir_fromcli" ]]; then
-+ ! -L "$kernel_source_dir" && \
- echo $""
- echo $"Kernel preparation unnecessary for this kernel. Skipping..."
- no_clean_kernel="no-clean-kernel"
-@@ -1044,7 +1055,22 @@ prepare_kernel()
- }
-
- # Set kernel_config
-- if [[ -e /etc/redhat-release || -e /etc/fedora-release ]]; then
-+ if [ -e /etc/mandriva-release ]; then
-+ if [ -z "$kernel_config" ] && [ -d "$kernel_source_dir/arch" ]; then
-+ local kernel_trunc=`echo $1 | sed 's/-.*//'`
-+ if [ "$2" == "i586" ] || [ "$2" == "i686" ]; then
-+ config_arch="i386"
-+ else
-+ config_arch=$2
-+ fi
-+ for config_type in BOOT smp enterprise secure i586-up-1GB i686-up-4GB p3-smp-64GB desktop586 desktop laptop server; do
-+ [ `echo "$1" | grep "$config_type"` ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig-$config_type"
-+ [ ! -e "$kernel_config" ] && kernel_config=""
-+ done
-+ [ -z "$kernel_config" ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig"
-+ [ ! -e "$kernel_config" ] && kernel_config=""
-+ fi
-+ elif [ -e /etc/redhat-release ] || [ -e /etc/fedora-release ]; then
- # Note this also applies to VMware 3.x
- if [[ -z $kernel_config && -d $kernel_source_dir/configs ]]; then
- local kernel_trunc=${1%%-*}
-@@ -1086,7 +1112,11 @@ prepare_kernel()
- invoke_command "make KERNELRELEASE=$1 cloneconfig" "make cloneconfig" background
- invoke_command "make 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"
-+ if [ -e /etc/mandriva-release ]; then
-+ echo $"Running OpenMandriva style preparation routine"
-+ else
-+ echo $"Running Red Hat style preparation routine"
-+ fi
- invoke_command "make clean" "make clean" background
- [[ $config_contents ]] && echo "$config_contents" > .config
-
-@@ -1132,7 +1162,7 @@ prepare_kernel()
- if [[ $(VER $1) < $(VER 2.5) ]]; then
- invoke_command "make KERNELRELEASE=$1 dep" "make dep" background
- else
-- invoke_command "make KERNELRELEASE=$1 prepare-all scripts" "make prepare-all" background
-+ invoke_command "make KERNELRELEASE=$1 prepare scripts" "make prepare" background
- fi
- fi
- cd - >/dev/null
-@@ -3379,6 +3409,7 @@ no_clean_kernel=""
- binaries_only=""
- source_only=""
- all=""
-+binary=""
- module_suffix=""
- rpm_safe_upgrade=""
- size="1440";
---- dkms-2.2.0.3/dkms_mkkerneldoth.mdkize 2008-07-08 17:19:41.000000000 +0200
-+++ dkms-2.2.0.3/dkms_mkkerneldoth 2013-05-24 20:32:17.898222189 +0200
-@@ -44,8 +44,8 @@ while [ $# -gt 0 ]; do
- done
-
-
--KERNEL_TYPE=`echo ${kernel_version} | sed 's_^.*\(BOOT\|smp\|enterprise\|bigmem\|hugemem\|debug\|vmnix\)$_-\1_;t;s_.*__;'`
--KERNEL_RELEASE=`echo ${kernel_version} | sed 's|BOOT\|smp\|enterprise\|bigmem\|hugemem\|debug||g'`
-+KERNEL_TYPE=`echo ${kernel_version} | sed 's_^.*\(desktop586\|desktop\|laptop\|server\|BOOT\|smp\|xen0\|legacy\|enterprise\|i586-up-1GB\|i686-up-4GB\|p3-smp-64GB\|secure\|bigmem\|hugemem\|debug\|vmnix\)$_-\1_;t;s_.*__;'`
-+KERNEL_RELEASE=`echo ${kernel_version} | sed 's|desktop586\|desktop\|laptop\|server\|BOOT\|smp\|xen0\|legacy\|enterprise\|i586-up-1GB\|i686-up-4GB\|p3-smp-64GB\|secure\|bigmem\|hugemem\|debug||g'`
-
- if [ -n "${target_arch}" ]; then
- KERNEL_ARCH="${target_arch}"
-@@ -60,8 +60,15 @@ if [ -n "$KERNEL_ARCH" ]; then
- BIGMEM='0'
- HUGEMEM='0'
- BOOT='0'
-+ I586_UP_1GB='0'
-+ I686_UP_4GB='0'
-+ P3_SMP_64GB='0'
-+ SECURE='0'
- DEBUG='0'
- VMNIX='0'
-+ XEN0='0'
-+ LEGACY='0'
-+ DEFAULT='0'
- case "$KERNEL_TYPE" in
- -BOOT)
- BOOT='1'
-@@ -70,13 +77,86 @@ if [ -n "$KERNEL_ARCH" ]; then
- fi
- ;;
- -smp) SMP='1';;
-+ -xen0) XEN0='1';;
-+ -legacy) LEGACY='1';;
- -enterprise) ENTERPRISE='1';;
-+ -i586-up-1GB) I586_UP_1GB='1';;
-+ -i686-up-4GB) I686_UP_4GB='1';;
-+ -p3-smp-64GB) P3_UP_64GB='1';;
-+ -secure) SECURE='1';;
- -bigmem) BIGMEM='1';;
- -hugemem) HUGEMEM='1';;
- -vmnix) VMNIX='1';;
- *) UP='1';;
- esac
-- cat > ${output_file} << EOF
-+
-+ # since 2.6.17-2mdv, default kernels can be SMP enabled by
-+ # default, hence a new name
-+ mdk="md[kv]"
-+ echo "$UP:${kernel_version}" | grep -q "^1:.*$mdk" && {
-+ case ${kernel_version} in
-+ # XXX simpler to maintain a skip list
-+ [01].*|2.[0-5].*|2.6.[0-9]-*|2.6.1[0-6]-*|2.6.17-1mdk);;
-+ *) UP=0; DEFAULT=1;;
-+ esac
-+ }
-+
-+ if [ -e /etc/mandriva-release ]; then
-+ cat > ${output_file} << EOF
-+/* This file is automatically generated at boot time. */
-+#ifndef __BOOT_KERNEL_H_
-+#define __BOOT_KERNEL_H_
-+
-+/* Kernel type $KERNEL_TYPE */
-+
-+#ifndef __BOOT_KERNEL_ENTERPRISE
-+#define __BOOT_KERNEL_ENTERPRISE $ENTERPRISE
-+#endif
-+
-+#ifndef __BOOT_KERNEL_SECURE
-+#define __BOOT_KERNEL_SECURE $SECURE
-+#endif
-+
-+#ifndef __BOOT_KERNEL_I586_UP_1GB
-+#define __BOOT_KERNEL_I586_UP_1GB $I586_UP_1GB
-+#endif
-+
-+#ifndef __BOOT_KERNEL_I686_UP_4GB
-+#define __BOOT_KERNEL_I686_UP_4GB $I686_UP_4GB
-+#endif
-+
-+#ifndef __BOOT_KERNEL_P3_SMP_4GB
-+#define __BOOT_KERNEL_P3_SMP_4GB $P3_SMP_4GB
-+#endif
-+
-+#ifndef __BOOT_KERNEL_SMP
-+#define __BOOT_KERNEL_SMP $SMP
-+#endif
-+
-+#ifndef __BOOT_KERNEL_UP
-+#define __BOOT_KERNEL_UP $UP
-+#endif
-+
-+#ifndef __BOOT_KERNEL_BOOT
-+#define __BOOT_KERNEL_BOOT $BOOT
-+#endif
-+
-+#ifndef __BOOT_KERNEL_LEGACY
-+#define __BOOT_KERNEL_LEGACY $LEGACY
-+#endif
-+
-+#ifndef __BOOT_KERNEL_DEFAULT
-+#define __BOOT_KERNEL_DEFAULT $DEFAULT
-+#endif
-+
-+#ifndef __BOOT_KERNEL_XEN0
-+#define __BOOT_KERNEL_XEN0 $XEN0
-+#endif
-+
-+#endif
-+EOF
-+ elif [ -e /etc/redhat-release ] || [ -e /etc/fedora-release ]; then
-+ cat > ${output_file} << EOF
- /* This file is automatically generated at boot time. */
- #ifndef __BOOT_KERNEL_H_
- #define __BOOT_KERNEL_H_
-@@ -120,4 +200,5 @@ if [ -n "$KERNEL_ARCH" ]; then
- #endif
- #endif
- EOF
-+ fi
- fi
diff --git a/dkms-2.2.0.3-min-max-kernel.patch b/dkms-2.2.0.3-min-max-kernel.patch
deleted file mode 100644
index 6b3d8be..0000000
--- a/dkms-2.2.0.3-min-max-kernel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- dkms-2.2.0.3/dkms.min-max-kernel 2013-05-24 22:04:24.594293260 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 22:07:42.986072743 +0200
-@@ -25,6 +25,7 @@
- readonly dkms_conf_variables="CLEAN REMAKE_INITRD remake_initrd PACKAGE_NAME
- PACKAGE_VERSION POST_ADD POST_INSTALL POST_REMOVE PRE_BUILD
- PRE_INSTALL BUILD_EXCLUSIVE_KERNEL BUILD_EXCLUSIVE_ARCH
-+ BUILD_MIN_KERNEL BUILD_MAX_KERNEL
- 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
-@@ -618,10 +619,16 @@ read_conf()
-
- # Set build_exclude
- [[ $BUILD_EXCLUSIVE_KERNEL && ! $1 =~ $BUILD_EXCLUSIVE_KERNEL ]] && \
-- build_exclude="yes"
-+ build_exclude="kernel does not match BUILD_EXCLUSIVE_KERNEL directive"
- [[ $BUILD_EXCLUSIVE_ARCH && ! $2 =~ $BUILD_EXCLUSIVE_ARCH ]] && \
-- build_exclude="yes"
-+ build_exclude="kernel does not match BUILD_EXCLUSIVE_KERNEL directive"
-
-+ if [ -n "$BUILD_MIN_KERNEL" ]; then
-+ [[ $(VER $1) > $(VER $BUILD_MIN_KERNEL) ]] || build_exclude="kernel version is inferior to BUILD_MIN_KERNEL directive"
-+ fi
-+ if [ -n "$BUILD_MAX_KERNEL" ]; then
-+ [[ $(VER $1) < $(VER $BUILD_MAX_KERNEL) ]] || build_exclude="kernel version is superior to BUILD_MAX_KERNEL directive"
-+ fi
- # Fail if absolutely no DEST_MODULE_LOCATION
- if ((${#dest_module_location[@]} == 0)); then
- echo $"dkms.conf: Error! No 'DEST_MODULE_LOCATION' directive specified." >&2
diff --git a/dkms-2.2.0.3-mkrpm_status.patch b/dkms-2.2.0.3-mkrpm_status.patch
deleted file mode 100644
index ffa5377..0000000
--- a/dkms-2.2.0.3-mkrpm_status.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- dkms-2.2.0.3/dkms.mkrpm 2013-05-24 22:45:35.400181624 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 22:45:40.083247892 +0200
-@@ -2876,10 +2876,13 @@ make_rpm()
- echo $"DKMS: mkrpm completed."
- else
- cat ${temp_dir_name}/rpmbuild.log >&2
-- die 7 $"There was a problem creating your rpm."
-+ RC=7
- fi
- rm -rf $temp_dir_name
-+ trap - EXIT HUP TERM > /dev/null 2>&1
- trap > /dev/null 2>&1
-+ [ ${RC} -ne 0 ] && exit ${RC}
-+ true
- }
-
- preproc_file()
diff --git a/dkms-2.2.0.3-parallel-build.patch b/dkms-2.2.0.3-parallel-build.patch
deleted file mode 100644
index be91260..0000000
--- a/dkms-2.2.0.3-parallel-build.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- dkms-2.2.0.3/dkms.parallel~ 2013-06-16 02:58:30.276854797 +0200
-+++ dkms-2.2.0.3/dkms 2013-06-16 03:01:49.485021308 +0200
-@@ -19,6 +19,8 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- #
-
-+# do build with jobs being twice the number of cpus
-+make_flags="-j$((`/usr/bin/getconf _NPROCESSORS_ONLN` * 2))"
-
- # All of the variables we will accept from dkms.conf.
- # Does not include directives
-@@ -587,22 +589,22 @@ read_conf()
- done
-
- # Get the correct make command
-- [[ ${MAKE_MATCH[0]} ]] || make_command="${MAKE[0]}"
-+ [[ ${MAKE_MATCH[0]} ]] || make_command="${MAKE[0]} $make_flags"
- for ((index=0; index < ${#MAKE[@]}; index++)); do
- [[ ${MAKE[$index]} && ${MAKE_MATCH[$index]} && \
- $1 =~ ${MAKE_MATCH[$index]} ]] && \
-- make_command="${MAKE[$index]}"
-+ make_command="${MAKE[$index]} $make_flags"
- done
-
- # Use the generic make and make clean commands if not specified
- if [[ $(VER $1) < $(VER 2.6.6) ]]; then
- [[ ! $make_command ]] && \
-- make_command="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
-+ make_command="make $make_flags -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
- [[ ! $clean ]] && \
- clean="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build clean"
- else
- [[ ! $make_command ]] && \
-- make_command="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
-+ make_command="make $make_flags -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
- [[ ! $clean ]] && \
- clean="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build clean"
- fi
-@@ -1145,8 +1147,8 @@ prepare_kernel()
- [[ $config_contents ]] && echo "$config_contents" > .config
- 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 $make_flags KERNELRELEASE=$1 cloneconfig" "make $make_flags cloneconfig" background
-+ invoke_command "make $make_flags CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make $make_flags CONFIG_MODVERSIONS=1 dep" background
- elif grep -q rhconfig.h $kernel_source_dir/include/linux/{modversions,version}.h 2>/dev/null; then
- if [ -e /etc/mandriva-release ]; then
- echo $"Running OpenMandriva style preparation routine"
-@@ -1178,7 +1180,7 @@ prepare_kernel()
- mv -f $kernel_source_dir/tmp_include_depends.new $kernel_source_dir/tmp_include_depends
- fi
-
-- invoke_command "make KERNELRELEASE=$1 oldconfig" "make oldconfig" background
-+ invoke_command "make $make_flags KERNELRELEASE=$1 oldconfig" "make $make_flags oldconfig" background
- kerneldoth_contents=$(cat /boot/kernel.h 2>/dev/null)
- invoke_command "/usr/lib/dkms/mkkerneldoth --kernelver $1 --targetarch $2 --output /boot/kernel.h" "running mkkerneldoth" background
- else
-@@ -1202,11 +1204,11 @@ prepare_kernel()
- $"Your build will likely fail because of this."
- fi
-
-- invoke_command "make KERNELRELEASE=$1 oldconfig" "make oldconfig" background
-+ invoke_command "make $make_flags KERNELRELEASE=$1 oldconfig" "make $make_flags oldconfig" background
- if [[ $(VER $1) < $(VER 2.5) ]]; then
-- invoke_command "make KERNELRELEASE=$1 dep" "make dep" background
-+ invoke_command "make $make_flags KERNELRELEASE=$1 dep" "make $make_flags dep" background
- else
-- invoke_command "make KERNELRELEASE=$1 prepare scripts" "make prepare" background
-+ invoke_command "make $make_flags KERNELRELEASE=$1 prepare scripts" "make $make_flags prepare" background
- fi
- fi
- cd - >/dev/null
diff --git a/dkms-2.2.0.3-parallel_fix.patch b/dkms-2.2.0.3-parallel_fix.patch
deleted file mode 100644
index 775bfe8..0000000
--- a/dkms-2.2.0.3-parallel_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- dkms-2.2.0.3.1/dkms.orig 2015-09-07 13:36:58.843478622 +0100
-+++ dkms-2.2.0.3.1/dkms 2015-09-07 13:38:24.110824324 +0100
-@@ -612,12 +612,12 @@
-
- # Use the generic make and make clean commands if not specified
- if [[ $(VER $1) < $(VER 2.6.6) ]]; then
-- [[ ! $make_command ]] && \
-+ [[ ! $make_command || $make_command == " $make_flags" ]] && \
- make_command="make $make_flags -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
- [[ ! $clean ]] && \
- clean="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build clean"
- else
-- [[ ! $make_command ]] && \
-+ [[ ! $make_command || $make_command == " $make_flags" ]] && \
- make_command="make $make_flags -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
- [[ ! $clean ]] && \
- clean="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build clean"
diff --git a/dkms-2.2.0.3-procconfig.patch b/dkms-2.2.0.3-procconfig.patch
deleted file mode 100644
index 507b93f..0000000
--- a/dkms-2.2.0.3-procconfig.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- dkms-2.2.0.3/dkms.procconfig 2013-05-24 20:50:25.483659867 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 20:51:47.062728908 +0200
-@@ -1067,13 +1067,20 @@ prepare_kernel()
- else
- config_arch=$2
- fi
-- for config_type in BOOT smp enterprise secure i586-up-1GB i686-up-4GB p3-smp-64GB desktop586 desktop laptop server; do
-- [ `echo "$1" | grep "$config_type"` ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig-$config_type"
-- [ ! -e "$kernel_config" ] && kernel_config=""
-- done
-- [ -z "$kernel_config" ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig"
-- [ ! -e "$kernel_config" ] && kernel_config=""
- fi
-+ if [ "$1" == `uname -r` ] && [ -e "/proc/config.gz" ]; then
-+ kernel_config="/proc/config.gz"
-+ elif [ -e "/boot/config-$1" ]; then
-+ kernel_config="/boot/config-$1"
-+ else
-+ for config_type in BOOT smp enterprise secure i586-up-1GB i686-up-4GB p3-smp-64GB desktop586 desktop laptop server; do
-+ [ `echo "$1" | grep "$config_type"` ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig-$config_type"
-+ [ ! -e "$kernel_config" ] && kernel_config=""
-+ done
-+ [ -z "$kernel_config" ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig"
-+ [ ! -e "$kernel_config" ] && kernel_config=""
-+ fi
-+
- elif [ -e /etc/redhat-release ] || [ -e /etc/fedora-release ]; then
- # Note this also applies to VMware 3.x
- if [[ -z $kernel_config && -d $kernel_source_dir/configs ]]; then
-@@ -1126,7 +1133,11 @@ prepare_kernel()
-
- if [[ $kernel_config ]]; then
- echo $"using $kernel_config"
-- cp -f "$kernel_config" .config
-+ if file -b -i "$kernel_config" | grep -q "application/x-gzip"; then
-+ zcat "$kernel_config" > .config
-+ else
-+ cp -f "$kernel_config" .config
-+ fi
- elif [[ -e .config ]]; then
- warn $"Using $kernel_source_dir/.config" \
- $"(I hope this is the correct config for this kernel)"
-@@ -1152,7 +1163,11 @@ prepare_kernel()
-
- if [[ $kernel_config ]]; then
- echo $"using $kernel_config"
-- cp -f "$kernel_config" .config
-+ if file -b -i "$kernel_config" | grep -q "application/x-gzip"; then
-+ zcat "$kernel_config" > .config
-+ else
-+ cp -f "$kernel_config" .config
-+ fi
- elif [[ -e .config ]]; then
- warn $"using $kernel_source_dir/.config" \
- $"(I hope this is the correct config for this kernel)"
diff --git a/dkms-2.2.0.3-suggest-devel-not-source.patch b/dkms-2.2.0.3-suggest-devel-not-source.patch
deleted file mode 100644
index 8c64a48..0000000
--- a/dkms-2.2.0.3-suggest-devel-not-source.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dkms-2.2.0.3/dkms.8.suggsts-devevl~ 2010-08-12 23:44:37.000000000 +0200
-+++ dkms-2.2.0.3/dkms.8 2013-05-24 23:21:57.518474101 +0200
-@@ -898,7 +898,7 @@ the location where DKMS keeps source on
- has changed it on their system.
- .TP
- .B $kernel_source_dir
--This variable holds the value of the location of your kernel source directory. Usually, this
-+This variable holds the value of the location of your kernel devel directory. Usually, this
- will be
- .I /lib/modules/$kernelver/build
- , unless otherwise specified with the
---- dkms-2.2.0.3/dkms.suggsts-devevl~ 2013-05-24 23:21:57.516474073 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 23:23:02.950403152 +0200
-@@ -1041,7 +1041,7 @@ prepare_kernel()
-
- set_kernel_source_dir "$1"
-
-- # Check that kernel-source exists
-+ # Check that kernel-devel exists
- _check_kernel_dir "$1" || {
- case "$running_distribution" in
- Debian* | Ubuntu* )
diff --git a/dkms-2.2.0.3-xz-support.patch b/dkms-2.2.0.3-xz-support.patch
deleted file mode 100644
index a5a3278..0000000
--- a/dkms-2.2.0.3-xz-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- dkms-2.2.0.3/dkms_find-provides.xz_support~ 2013-05-24 23:26:35.530418672 +0200
-+++ dkms-2.2.0.3/dkms_find-provides 2013-05-24 23:26:50.492630916 +0200
-@@ -64,7 +64,7 @@ TMPDIR=$(mktemp -d ${tmp}/dkms-findprovi
- trap "rm -rf $TMPDIR >/dev/null 2>&1" QUIT EXIT HUP INT TERM
-
- modlist=
--for cand in $(grep -E '(/lib/modules/.+\.ko$|tgz$|tbz$|tar\.(gz|bz2)$)') $*; do
-+for cand in $(grep -E '(/lib/modules/.+\.ko$|tgz$|tbz$|tar\.(gz|bz2|xz)$)') $*; do
- if echo $cand | grep -q -E '/lib/modules/.+\.ko$' > /dev/null 2>&1; then
- modlist="$modlist $cand"
- fi
-@@ -76,6 +76,8 @@ for cand in $(grep -E '(/lib/modules/.+\
- opts=${opts}z
- elif bzip2 -t $cand >/dev/null 2>&1; then
- opts=${opts}j
-+ elif xz -t $cand >/dev/null 2>&1; then
-+ opts=${opts}J
- fi
- tar ${opts}f $cand -C $TMPDIR > /dev/null 2>&1
- done
---- dkms-2.2.0.3/dkms.xz_support~ 2013-05-24 23:26:35.529418658 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 23:32:42.750627787 +0200
-@@ -156,7 +156,10 @@ set_module_suffix()
- grep -q '\.gz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && gz_modules=1
- if [ -n "$gz_modules" ]; then
- [ -z "$delayed_gzip" ] && module_suffix=${module_suffix}.gz
-- fi
-+ fi
-+ if [ -n "$xz_modules" ]; then
-+ module_suffix=${module_suffix}.xz
-+ fi
- }
-
- set_kernel_source_dir()
-@@ -244,6 +247,10 @@ do_depmod()
- else
- /sbin/depmod -a "$1"
- fi
-+ grep -q '\.xz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && xz_modules=1
-+ if [ -n "$xz_modules" ]; then
-+ [ -z "$delayed_xz" ] && module_suffix=${module_suffix}.xz
-+ fi
- }
-
- # This function is a little hairy -- every distro has slightly different tools
-@@ -1308,6 +1315,10 @@ do_build()
- if [ -n "$gz_modules" ]; then
- gzip -9f $dkms_tree/$module/$module_version/${kernelver_array[0]}/${arch_array[0]}/module/${dest_module_name[$count]}$module_suffix
- fi
-+ if [ -n "$xz_modules" ]; then
-+ xz -f $dkms_tree/$module/$module_version/${kernelver_array[0]}/${arch_array[0]}/module/${dest_module_name[$count]}$module_suffix
-+ fi
-+
- # Run the post_build script
- run_build_script post_build "$post_build"
- }
-@@ -2602,7 +2613,7 @@ load_tarball()
- fi
- fi
-
-- # Figure out what kind of archive it is (tar.gz, tar, tar.bz, etc)
-+ # Figure out what kind of archive it is (tar.gz, tar, tar.bz, tar.xz. etc)
- # Note that this does not depend on the extensions being correct.
- local tar_options=""
- for xpand in gzip bzip xz; do
-@@ -2816,6 +2827,9 @@ make_rpm()
- die 1 $"rpmbuild not present." \
- $"Install the rpm-build package."
- fi
-+ if `xz -t $archive_location 2>/dev/null`; then
-+ tar_options="${tar_options}J"
-+ fi
-
- # Read the conf file
- read_conf_or_die "$kernelver" "$arch"
-@@ -3589,7 +3603,7 @@ for action_to_run in $action; do
- match) check_root && have_one_kernel && run_match;;
- uninstall) check_root && have_one_kernel && uninstall_module;;
- mkdriverdisk) check_root && make_driver_disk;;
-- build) delayed_gzip=1 && build_modules;;
-+ build) delayed_xz=1 && delayed_gzip=1 && build_modules;;
- add) add_module;;
- mktarball) make_tarball;;
- mkrpm) make_rpm;;
diff --git a/dkms-2.2.0.3.1-add-dependency-logic-for-automatic-builds.patch b/dkms-2.2.0.3.1-add-dependency-logic-for-automatic-builds.patch
deleted file mode 100644
index 5f760d0..0000000
--- a/dkms-2.2.0.3.1-add-dependency-logic-for-automatic-builds.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- dkms-2.2.0.3.1/dkms.8.autodeplogic~ 2014-03-07 02:11:03.673511411 +0100
-+++ dkms-2.2.0.3.1/dkms.8 2014-03-07 02:11:03.679511671 +0100
-@@ -871,6 +871,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
---- dkms-2.2.0.3.1/dkms.autodeplogic~ 2014-03-07 02:11:03.671511325 +0100
-+++ dkms-2.2.0.3.1/dkms 2014-03-07 02:11:03.678511628 +0100
-@@ -3,6 +3,7 @@
- # Dynamic Kernel Module Support (DKMS) <dkms-devel@dell.com>
- # Copyright (C) 2003-2008 Dell, Inc.
- # by Gary Lerhaupt, Matt Domsch, & Mario Limonciello
-+# Copyright (C) 2012 by Darik Horn <dajhorn@vanadac.com>
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -3281,7 +3282,12 @@ 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
-@@ -3298,7 +3304,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
-@@ -3308,14 +3317,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) &
-- done
-- wait
-+
-+ while true; do
-+ install_count=0
-+ next_install=( )
-+
-+ # Step 1: Install modules that have an empty depdendency 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 2: Keep going if at least one module was installed during
-+ # this iteration.
-+ [[ "$install_count" -gt 0 ]] || break;
-+
-+ # Step 3: Remove modules that were installed during Step 1 from
-+ # the dependency lists of all other modules.
-+ for m in ${!build_depends[@]}; do
-+ for d in ${build_depends[$m]}; do
-+ for i in ${installed_modules}; do
-+ [[ "$d" = "$i" ]] && break 2
-+ done
-+ next_depends+="$d "
-+ done
-+ build_depends[$m]="${next_depends%% }"
-+ done
-+
-+ # Step 4: Remove modules that were installed during Step 1 from
-+ # the job queue.
-+ to_install=( "${next_install[@]}" )
-+ done
- }
-
- function make_redhat3_driver_disk ()
diff --git a/dkms-2.2.0.3.1-xz-support.patch b/dkms-2.2.0.3.1-xz-support.patch
deleted file mode 100644
index 71dcb33..0000000
--- a/dkms-2.2.0.3.1-xz-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- dkms-2.2.0.3.1/dkms_find-provides.xz_support~ 2013-06-18 03:54:55.000000000 +0200
-+++ dkms-2.2.0.3.1/dkms_find-provides 2013-06-18 03:57:26.356920066 +0200
-@@ -64,7 +64,7 @@ TMPDIR=$(mktemp -d ${tmp}/dkms-findprovi
- trap "rm -rf $TMPDIR >/dev/null 2>&1" QUIT EXIT HUP INT TERM
-
- modlist=
--for cand in $(grep -E '(/lib/modules/.+\.ko$|tgz$|tbz$|tar\.(gz|bz2)$)') $*; do
-+for cand in $(grep -E '(/lib/modules/.+\.ko$|tgz$|tbz$|tar\.(gz|bz2|xz)$)') $*; do
- if echo $cand | grep -q -E '/lib/modules/.+\.ko$' > /dev/null 2>&1; then
- modlist="$modlist $cand"
- fi
-@@ -76,6 +76,8 @@ for cand in $(grep -E '(/lib/modules/.+\
- opts=${opts}z
- elif bzip2 -t $cand >/dev/null 2>&1; then
- opts=${opts}j
-+ elif xz -t $cand >/dev/null 2>&1; then
-+ opts=${opts}J
- fi
- tar ${opts}f $cand -C $TMPDIR > /dev/null 2>&1
- done
---- dkms-2.2.0.3.1/dkms.xz_support~ 2013-06-18 03:57:26.352920033 +0200
-+++ dkms-2.2.0.3.1/dkms 2013-06-18 04:06:10.756125866 +0200
-@@ -159,7 +159,10 @@ set_module_suffix()
- grep -q '\.gz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && gz_modules=1
- if [ -n "$gz_modules" ]; then
- [ -z "$delayed_gzip" ] && module_suffix=${module_suffix}.gz
-- fi
-+ fi
-+ if [ -n "$xz_modules" ]; then
-+ module_suffix=${module_suffix}.xz
-+ fi
- }
-
- set_kernel_source_dir()
-@@ -253,6 +256,10 @@ do_depmod()
- else
- depmod -a "$1"
- fi
-+ grep -q '\.xz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && xz_modules=1
-+ if [ -n "$xz_modules" ]; then
-+ [ -z "$delayed_xz" ] && module_suffix=${module_suffix}.xz
-+ fi
- }
-
- # This function is a little hairy -- every distro has slightly different tools
-@@ -1318,6 +1325,10 @@ do_build()
- if [ -n "$gz_modules" ]; then
- gzip -9f $dkms_tree/$module/$module_version/${kernelver_array[0]}/${arch_array[0]}/module/${dest_module_name[$count]}$module_suffix
- fi
-+ if [ -n "$xz_modules" ]; then
-+ xz -f $dkms_tree/$module/$module_version/${kernelver_array[0]}/${arch_array[0]}/module/${dest_module_name[$count]}$module_suffix
-+ fi
-+
- # Run the post_build script
- run_build_script post_build "$post_build"
- }
-@@ -2644,7 +2655,7 @@ load_tarball()
- fi
- fi
-
-- # Figure out what kind of archive it is (tar.gz, tar, tar.bz, etc)
-+ # Figure out what kind of archive it is (tar.gz, tar, tar.bz, tar.xz. etc)
- # Note that this does not depend on the extensions being correct.
- local tar_options=""
- for xpand in gzip bzip xz; do
-@@ -2858,6 +2869,9 @@ make_rpm()
- die 1 $"rpmbuild not present." \
- $"Install the rpm-build package."
- fi
-+ if `xz -t $archive_location 2>/dev/null`; then
-+ tar_options="${tar_options}J"
-+ fi
-
- # Read the conf file
- read_conf_or_die "$kernelver" "$arch"
-@@ -3639,7 +3653,7 @@ for action_to_run in $action; do
- match) check_root && have_one_kernel && run_match;;
- uninstall) check_root && have_one_kernel && uninstall_module;;
- mkdriverdisk) check_root && make_driver_disk;;
-- build) delayed_gzip=1 && build_modules;;
-+ build) delayed_xz=1 && delayed_gzip=1 && build_modules;;
- add) add_module;;
- mktarball) make_tarball;;
- mkrpm) make_rpm;;
diff --git a/dkms-2.2.0.3.1.tar.xz b/dkms-2.2.0.3.1.tar.xz
new file mode 100644
index 0000000..cae69bb
Binary files /dev/null and b/dkms-2.2.0.3.1.tar.xz differ
diff --git a/dkms-2.2.0.3-autoalias.patch b/dkms-2.6.1-autoalias.patch
similarity index 51%
rename from dkms-2.2.0.3-autoalias.patch
rename to dkms-2.6.1-autoalias.patch
index 3dc4866..1fcebd2 100644
--- a/dkms-2.2.0.3-autoalias.patch
+++ b/dkms-2.6.1-autoalias.patch
@@ -1,26 +1,27 @@
---- dkms-2.2.0.3/dkms.autoalias 2013-05-24 22:38:12.164909302 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 22:41:20.267571240 +0200
-@@ -32,8 +32,8 @@ readonly dkms_conf_variables="CLEAN REMA
- DEST_MODULE_NAME dest_module_name MODULES_CONF_OBSOLETES
- DEST_MODULE_LOCATION dest_module_location
- modules_conf_obsoletes MODULES_CONF_ALIAS_TYPE
-- modules_conf_alias_type STRIP strip MODULES_CONF_OBSOLETE_ONLY
-- modules_conf_obsolete_only AUTOINSTALL"
-+ modules_conf_alias_type MODULES_CONF_EXTRACT_ALIASES MODULES_CONF_OBSOLETE_ONLY
-+ STRIP strip MODULES_CONF_OBSOLETE_ONLY modules_conf_obsolete_only AUTOINSTALL"
+--- dkms-2.6.1/dkms 2018-08-10 16:58:52.603299345 +0100
++++ dkms-2.6.1/dkms.new 2018-08-10 17:01:35.379330725 +0100
+@@ -33,8 +33,9 @@
+ DEST_MODULE_NAME dest_module_name MODULES_CONF_OBSOLETES
+ DEST_MODULE_LOCATION dest_module_location
+ modules_conf_obsoletes MODULES_CONF_ALIAS_TYPE
+- modules_conf_alias_type STRIP strip MODULES_CONF_OBSOLETE_ONLY
+- modules_conf_obsolete_only AUTOINSTALL NO_WEAK_MODULES"
++ modules_conf_alias_type MODULES_CONF_EXTRACT_ALIASES MODULES_CONF_OBSOLETE_ONLY
++ STRIP strip MODULES_CONF_OBSOLETE_ONLY modules_conf_obsolete_only AUTOINSTALL"
++
# Some important regular expressions. Requires bash 3 or above.
# Any poor souls still running bash 2 or older really need an upgrade.
-@@ -517,6 +517,7 @@ read_conf()
- dest_module_location[$index]=${DEST_MODULE_LOCATION[$index]}
- modules_conf_obsoletes[$index]=${MODULES_CONF_OBSOLETES[$index]}
- modules_conf_alias_type[$index]=${MODULES_CONF_ALIAS_TYPE[$index]}
-+ modules_conf_extract_aliases[$index]=${MODULES_CONF_EXTRACT_ALIASES[$index]}
- case ${MODULES_CONF_OBSOLETE_ONLY[$index]} in
- [yY]*) modules_conf_obsolete_only[$index]="yes";;
- esac
-@@ -897,6 +898,16 @@ moduleconfig_remove()
- done
+@@ -605,6 +606,7 @@
+ dest_module_location[$index]=${DEST_MODULE_LOCATION[$index]}
+ modules_conf_obsoletes[$index]=${MODULES_CONF_OBSOLETES[$index]}
+ modules_conf_alias_type[$index]=${MODULES_CONF_ALIAS_TYPE[$index]}
++ modules_conf_extract_aliases[$index]=${MODULES_CONF_EXTRACT_ALIASES[$index]}
+ case ${MODULES_CONF_OBSOLETE_ONLY[$index]} in
+ [yY]*)
+ modules_conf_obsolete_only[$index]="yes"
+@@ -998,6 +1000,16 @@
+ done
done
+ if [ -d /etc/modprobe.d ]; then
@@ -36,7 +37,7 @@
# Delete the temp dir
rm -rf $temp_dir_name
}
-@@ -1671,6 +1682,14 @@ do_uninstall()
+@@ -1846,6 +1858,14 @@
# Run the post_remove script
run_build_script post_remove "$post_remove"
diff --git a/dkms-2.2.0.3-binary_only.patch b/dkms-2.6.1-binary_only.patch
similarity index 55%
rename from dkms-2.2.0.3-binary_only.patch
rename to dkms-2.6.1-binary_only.patch
index b08d26b..7fe5ea0 100644
--- a/dkms-2.2.0.3-binary_only.patch
+++ b/dkms-2.6.1-binary_only.patch
@@ -1,14 +1,14 @@
---- dkms-2.2.0.3/dkms.binary_only~ 2013-05-25 07:39:49.526787441 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-25 07:41:33.280717199 +0200
-@@ -2844,9 +2844,9 @@ make_rpm()
+--- dkms-2.6.1/dkms 2018-08-10 15:39:22.189674259 +0100
++++ dkms-2.6.1/dkms.binary_only~ 2018-08-10 15:43:37.451282488 +0100
+@@ -2939,9 +2939,9 @@
invoke_command "LC_ALL=C rpmbuild --define \"_topdir ${temp_dir_name}\" --define \"version $module_version\" ${module_release:+--define \"rel $module_release\"} --define \"module_name $module\" --define \"kernel_versions ${kernelver_array[*]}\" --define \"mktarball_line $mktarball_line\" -ba ${temp_dir_name}/SPECS/dkms_mkrpm.spec > ${temp_dir_name}/rpmbuild.log 2>&1" "rpmbuild"
if [ "$?" -eq 0 ]; then
- mkdir -p ${rpm_basedir}
-- cp -a ${temp_dir_name}/SRPMS/* ${temp_dir_name}/RPMS/*/* ${rpm_basedir}/
+ mkdir -p ${rpm_basedir}
+- cp -a ${temp_dir_name}/SRPMS/* ${temp_dir_name}/RPMS/*/* ${rpm_basedir}/
+ cp -a ${temp_dir_name}/RPMS/*/* ${rpm_basedir}/
- echo $""
-- cat ${temp_dir_name}/rpmbuild.log | grep ^Wrote | sed -e "s:${temp_dir_name}/:${rpm_basedir}/:" -e 's:SRPMS/::' -e 's:RPMS/.*/::'
+ echo $""
+- cat ${temp_dir_name}/rpmbuild.log | grep ^Wrote | sed -e "s:${temp_dir_name}/:${rpm_basedir}/:" -e 's:SRPMS/::' -e 's:RPMS/.*/::'
+ cat ${temp_dir_name}/rpmbuild.log | grep ^Wrote | sed -e "s:${temp_dir_name}/:${rpm_basedir}/:" -e 's:RPMS/.*/::'
- echo $""
- echo $"DKMS: mkrpm completed."
+ echo $""
+ echo $"DKMS: mkrpm completed."
else
diff --git a/dkms-2.6.1-dont_fail_if_module_source_removed.patch b/dkms-2.6.1-dont_fail_if_module_source_removed.patch
new file mode 100644
index 0000000..9832607
--- /dev/null
+++ b/dkms-2.6.1-dont_fail_if_module_source_removed.patch
@@ -0,0 +1,13 @@
+--- dkms-2.6.1/dkms 2018-08-12 14:32:17.778872796 +0100
++++ dkms-2.6.1/dkms.dontfail~ 2018-08-12 15:27:19.440297076 +0100
+@@ -549,6 +549,9 @@
+ [[ $conf ]] && read_conf_file="$conf"
+ [[ $3 ]] && read_conf_file="$3"
+
++ [[ ! -r $read_conf_file && -r $dkms_tree/$module/$module_version/build/dkms.conf ]] && \
++ read_conf_file="$dkms_tree/$module/$module_version/build/dkms.conf"
++
+ [[ -r $read_conf_file ]] || die 4 $"Could not locate dkms.conf file." \
+ $"File: $read_conf_file does not exist."
+
+
diff --git a/dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch b/dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch
new file mode 100644
index 0000000..e847b49
--- /dev/null
+++ b/dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch
@@ -0,0 +1,11 @@
+--- dkms-2.6.1/dkms 2018-08-10 20:27:19.672834839 +0100
++++ dkms-2.6.1/dkms.generic-prepare~ 2018-08-10 20:40:56.016296151 +0100
+@@ -1168,7 +1168,7 @@
+ if [[ (! ( $(VER $1) < $(VER 2.6.5) ) || -d /etc/SuSEconfig) && \
+ -d "$kernel_source_dir" && \
+ -z "$ksourcedir_fromcli" ]]; then
+- ! -L "$kernel_source_dir" && \
++ [[ ($(VER $1) > $(VER 2.6.38) || ! -L "$kernel_source_dir") ]] && \
+ echo $""
+ echo $"Kernel preparation unnecessary for this kernel. Skipping..."
+ no_clean_kernel="no-clean-kernel"
diff --git a/dkms-2.6.1-mdkize.patch b/dkms-2.6.1-mdkize.patch
new file mode 100644
index 0000000..a130a71
--- /dev/null
+++ b/dkms-2.6.1-mdkize.patch
@@ -0,0 +1,81 @@
+--- dkms-2.6.1/dkms 2018-04-25 16:56:48.000000000 +0100
++++ dkms-2.6.1/dkms.mdkize~ 2018-08-10 14:39:08.097290692 +0100
+@@ -925,6 +925,16 @@
+ done
+ done
+
++ if [ -d /etc/modprobe.d ]; then
++ local index=0
++ while [ $index -lt ${#dest_module_name[@]} ]; do
++ if [ "${modules_conf_extract_aliases[$index]}" = yes -a -f $install_tree/${kernelver_array[0]}${dest_module_location[$index]}/${dest_module_name[$index]}$module_suffix ]; then
++ modinfo $install_tree/${kernelver_array[0]}${dest_module_location[$index]}/${dest_module_name[$index]}$module_suffix | sed -n -e "s/alias:\(.*\)$/alias \1 ${dest_module_name[$index]}/p" > /etc/modprobe.d/dkms-aliases-${dest_module_name[$index]}
++ fi
++ index=$(($index+1))
++ done
++ fi
++
+ # Delete the temp dir
+ rm -rf $temp_dir_name
+ }
+@@ -1137,6 +1147,7 @@
+ if [[ (! ( $(VER $1) < $(VER 2.6.5) ) || -d /etc/SuSEconfig) && \
+ -d "$kernel_source_dir" && \
+ -z "$ksourcedir_fromcli" ]]; then
++ ! -L "$kernel_source_dir" && \
+ echo $""
+ echo $"Kernel preparation unnecessary for this kernel. Skipping..."
+ no_clean_kernel="no-clean-kernel"
+@@ -1154,7 +1165,22 @@
+ }
+
+ # Set kernel_config
+- if [[ -e /etc/redhat-release || -e /etc/fedora-release ]]; then
++ if [ -e /etc/mandriva-release ]; then
++ if [ -z "$kernel_config" ] && [ -d "$kernel_source_dir/arch" ]; then
++ local kernel_trunc=`echo $1 | sed 's/-.*//'`
++ if [ "$2" == "i586" ] || [ "$2" == "i686" ]; then
++ config_arch="i386"
++ else
++ config_arch=$2
++ fi
++ for config_type in BOOT smp enterprise secure i586-up-1GB i686-up-4GB p3-smp-64GB desktop586 desktop laptop server; do
++ [ `echo "$1" | grep "$config_type"` ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig-$config_type"
++ [ ! -e "$kernel_config" ] && kernel_config=""
++ done
++ [ -z "$kernel_config" ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig"
++ [ ! -e "$kernel_config" ] && kernel_config=""
++ fi
++ elif [ -e /etc/redhat-release ] || [ -e /etc/fedora-release ]; then
+ # Note this also applies to VMware 3.x
+ if [[ -z $kernel_config && -d $kernel_source_dir/configs ]]; then
+ local kernel_trunc=${1%%-*}
+@@ -1198,7 +1224,11 @@
+ invoke_command "make KERNELRELEASE=$1 cloneconfig" "make cloneconfig" 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"
++ if [ -e /etc/mandriva-release ]; then
++ echo $"Running OpenMandriva style preparation routine"
++ else
++ echo $"Running Red Hat style preparation routine"
++ fi
+ invoke_command "make clean" "make clean" background
+ [[ $config_contents ]] && echo "$config_contents" > .config
+
+@@ -1244,7 +1274,7 @@
+ if [[ $(VER $1) < $(VER 2.5) ]]; then
+ invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 dep" "make dep" background
+ else
+- invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 prepare-all scripts" "make prepare-all" background
++ invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 prepare scripts" "make prepare" background
+ fi
+ fi
+ cd - >/dev/null
+@@ -3553,6 +3583,7 @@
+ binaries_only=""
+ source_only=""
+ all=""
++binary=""
+ module_suffix=""
+ module_uncompressed_suffix=""
+ module_compressed_suffix=""
diff --git a/dkms-2.2.0.3-mdkrpm-split-ver-rel.patch b/dkms-2.6.1-mdkrpm-split-ver-rel.patch
similarity index 70%
rename from dkms-2.2.0.3-mdkrpm-split-ver-rel.patch
rename to dkms-2.6.1-mdkrpm-split-ver-rel.patch
index 8689ebe..b8bbcab 100644
--- a/dkms-2.2.0.3-mdkrpm-split-ver-rel.patch
+++ b/dkms-2.6.1-mdkrpm-split-ver-rel.patch
@@ -1,7 +1,7 @@
---- dkms-2.2.0.3/dkms.mdkrpm-split-ver-rel~ 2013-05-25 07:37:33.790559474 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-25 07:38:40.883168276 +0200
-@@ -2837,7 +2837,12 @@ make_rpm()
- invoke_command "cp -Lpr '$dkms_tree/$module/$module_version/source' '${temp_dir_name}/SOURCES/$module-$module_version'" "Copying source tree"
+--- dkms-2.6.1/dkms 2018-08-10 15:28:25.612383673 +0100
++++ dkms-2.6.1/dkms.mdkrpm-split-ver-rel~ 2018-08-10 15:34:51.085169522 +0100
+@@ -2932,7 +2932,12 @@
+ invoke_command "cp -Lpr '$dkms_tree/$module/$module_version/source' '${temp_dir_name}/SOURCES/$module-$module_version'" "Copying source tree"
fi
- if invoke_command "LC_ALL=C rpmbuild --define \"_topdir ${temp_dir_name}\" --define \"version $module_version\" --define \"module_name $module\" --define \"kernel_versions ${kernelver[*]}\" --define \"mktarball_line $mktarball_line\" --define \"__find_provides /usr/lib/dkms/find-provides\" --define \"_use_internal_dependency_generator 0\" -ba ${temp_dir_name}/SPECS/dkms_mkrpm.spec > ${temp_dir_name}/rpmbuild.log 2>&1" "rpmbuild"; then
@@ -11,6 +11,6 @@
+ fi
+ invoke_command "LC_ALL=C rpmbuild --define \"_topdir ${temp_dir_name}\" --define \"version $module_version\" ${module_release:+--define \"rel $module_release\"} --define \"module_name $module\" --define \"kernel_versions ${kernelver_array[*]}\" --define \"mktarball_line $mktarball_line\" -ba ${temp_dir_name}/SPECS/dkms_mkrpm.spec > ${temp_dir_name}/rpmbuild.log 2>&1" "rpmbuild"
+ if [ "$?" -eq 0 ]; then
- mkdir -p ${rpm_basedir}
- cp -a ${temp_dir_name}/SRPMS/* ${temp_dir_name}/RPMS/*/* ${rpm_basedir}/
- echo $""
+ mkdir -p ${rpm_basedir}
+ cp -a ${temp_dir_name}/SRPMS/* ${temp_dir_name}/RPMS/*/* ${rpm_basedir}/
+ echo $""
diff --git a/dkms-2.6.1-min-max-kernel.patch b/dkms-2.6.1-min-max-kernel.patch
new file mode 100644
index 0000000..4d3e2ff
--- /dev/null
+++ b/dkms-2.6.1-min-max-kernel.patch
@@ -0,0 +1,30 @@
+--- dkms-2.6.1/dkms 2018-08-10 16:30:27.277410872 +0100
++++ dkms-2.6.1/dkms.min-max-kernel~ 2018-08-10 16:39:45.634237828 +0100
+@@ -26,6 +26,7 @@
+ 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_DEPENDS BUILD_EXCLUSIVE_KERNEL BUILD_EXCLUSIVE_ARCH
++ BUILD_MIN_KERNEL BUILD_MAX_KERNEL
+ 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
+@@ -712,9 +713,17 @@
+ [[ $REMAKE_INITRD =~ $y_re ]] && remake_initrd="yes"
+
+ # Set build_exclude
+- [[ $BUILD_EXCLUSIVE_KERNEL && ! $1 =~ $BUILD_EXCLUSIVE_KERNEL ]] && build_exclude="yes"
+- [[ $BUILD_EXCLUSIVE_ARCH && ! $2 =~ $BUILD_EXCLUSIVE_ARCH ]] && build_exclude="yes"
++ [[ $BUILD_EXCLUSIVE_KERNEL && ! $1 =~ $BUILD_EXCLUSIVE_KERNEL ]] && \
++ build_exclude="kernel does not match BUILD_EXCLUSIVE_KERNEL directive"
++ [[ $BUILD_EXCLUSIVE_ARCH && ! $2 =~ $BUILD_EXCLUSIVE_ARCH ]] && \
++ build_exclude="kernel does not match BUILD_EXCLUSIVE_KERNEL directive"
+
++ if [ -n "$BUILD_MIN_KERNEL" ]; then
++ [[ $(VER $1) > $(VER $BUILD_MIN_KERNEL) ]] || build_exclude="kernel version is inferior to BUILD_MIN_KERNEL directive"
++ fi
++ if [ -n "$BUILD_MAX_KERNEL" ]; then
++ [[ $(VER $1) < $(VER $BUILD_MAX_KERNEL) ]] || build_exclude="kernel version is superior to BUILD_MAX_KERNEL directive"
++ fi
+ # Fail if absolutely no DEST_MODULE_LOCATION
+ if ((${#dest_module_location[@]} == 0)); then
+ echo $"dkms.conf: Error! No 'DEST_MODULE_LOCATION' directive specified." >&2
diff --git a/dkms-2.6.1-mkrpm_status.patch b/dkms-2.6.1-mkrpm_status.patch
new file mode 100644
index 0000000..f9f7008
--- /dev/null
+++ b/dkms-2.6.1-mkrpm_status.patch
@@ -0,0 +1,17 @@
+--- dkms-2.6.1/dkms 2018-08-10 17:07:58.879068089 +0100
++++ dkms-2.6.1/dkms.mkrpm~ 2018-08-10 17:17:08.685848588 +0100
+@@ -2975,10 +2975,13 @@
+ echo $"DKMS: mkrpm completed."
+ else
+ cat ${temp_dir_name}/rpmbuild.log >&2
+- die 7 $"There was a problem creating your rpm."
++ RC=7
+ fi
+ rm -rf $temp_dir_name
++ trap - EXIT HUP TERM > /dev/null 2>&1
+ trap > /dev/null 2>&1
++ [ ${RC} -ne 0 ] && exit ${RC}
++ true
+ }
+
+ preproc_file()
diff --git a/dkms-2.6.1-parallel-build.patch b/dkms-2.6.1-parallel-build.patch
new file mode 100644
index 0000000..35855f2
--- /dev/null
+++ b/dkms-2.6.1-parallel-build.patch
@@ -0,0 +1,81 @@
+--- dkms-2.6.1/dkms 2018-08-10 21:33:12.271051091 +0100
++++ dkms-2.6.1/dkms.parallel~ 2018-08-10 22:41:38.724646574 +0100
+@@ -20,8 +20,6 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ #
+
+-# do build with jobs being twice the number of cpus
+-make_flags="-j$((`/usr/bin/getconf _NPROCESSORS_ONLN` * 2))"
+
+ # All of the variables we will accept from dkms.conf.
+ # Does not include directives
+@@ -683,20 +681,24 @@
+ done
+
+ # Get the correct make command
+- [[ ${MAKE_MATCH[0]} ]] || make_command="${MAKE[0]}"
++ [[ ${MAKE_MATCH[0]} ]] || make_command="${MAKE[0]} $make_flags"
+ for ((index=0; index < ${#MAKE[@]}; index++)); do
+ [[ ${MAKE[$index]} && ${MAKE_MATCH[$index]} && \
+ $1 =~ ${MAKE_MATCH[$index]} ]] && \
+- make_command="${MAKE[$index]}"
++ make_command="${MAKE[$index]} $make_flags"
+ done
+
+ # Use the generic make and make clean commands if not specified
+ if [[ $(VER $1) < $(VER 2.6.6) ]]; then
+- [[ ! $make_command ]] && make_command="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
+- [[ ! $clean ]] && clean="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build clean"
++ [[ ! $make_command ]] && \
++ make_command="make $make_flags -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
++ [[ ! $clean ]] && \
++ clean="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build clean"
+ else
+- [[ ! $make_command ]] && make_command="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
+- [[ ! $clean ]] && clean="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build clean"
++ [[ ! $make_command ]] && \
++ make_command="make $make_flags -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
++ [[ ! $clean ]] && \
++ clean="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build clean"
+ fi
+
+ # Set modules_conf_array
+@@ -1251,8 +1253,8 @@
+ [[ $config_contents ]] && echo "$config_contents" > .config
+ 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 -j$parallel_jobs CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make CONFIG_MODVERSIONS=1 dep" background
++ invoke_command "make $make_flags KERNELRELEASE=$1 cloneconfig" "make $make_flags cloneconfig" background
++ invoke_command "make $make_flags CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make $make_flags CONFIG_MODVERSIONS=1 dep" background
+ elif grep -q rhconfig.h $kernel_source_dir/include/linux/{modversions,version}.h 2>/dev/null; then
+ if [ -e /etc/mandriva-release ]; then
+ echo $"Running OpenMandriva style preparation routine"
+@@ -1283,8 +1285,8 @@
+ sed 's/\/usr\/src\/build\/.*\/install//g' $kernel_source_dir/tmp_include_depends > $kernel_source_dir/tmp_include_depends.new
+ mv -f $kernel_source_dir/tmp_include_depends.new $kernel_source_dir/tmp_include_depends
+ fi
+-
+- invoke_command "make KERNELRELEASE=$1 oldconfig" "make oldconfig" background
++
++ invoke_command "make $make_flags KERNELRELEASE=$1 oldconfig" "make $make_flags oldconfig" background
+ kerneldoth_contents=$(cat /boot/kernel.h 2>/dev/null)
+ invoke_command "/usr/lib/dkms/mkkerneldoth --kernelver $1 --targetarch $2 --output /boot/kernel.h" "running mkkerneldoth" background
+ else
+@@ -1307,12 +1309,11 @@
+ $"Try using the --config option to specify where one can be found." \
+ $"Your build will likely fail because of this."
+ fi
+-
+- invoke_command "make KERNELRELEASE=$1 oldconfig" "make oldconfig" background
++ invoke_command "make $make_flags KERNELRELEASE=$1 oldconfig" "make $make_flags oldconfig" background
+ if [[ $(VER $1) < $(VER 2.5) ]]; then
+- invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 dep" "make dep" background
+- else
+- invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 prepare scripts" "make prepare" background
++ invoke_command "make $make_flags KERNELRELEASE=$1 dep" "make $make_flags dep" background
++ else
++ invoke_command "make $make_flags KERNELRELEASE=$1 prepare scripts" "make $make_flags prepare" background
+ fi
+ fi
+ cd - >/dev/null
diff --git a/dkms-2.6.1-parallel_fix.patch b/dkms-2.6.1-parallel_fix.patch
new file mode 100644
index 0000000..80ed7b9
--- /dev/null
+++ b/dkms-2.6.1-parallel_fix.patch
@@ -0,0 +1,17 @@
+--- dkms-2.6.1/dkms 2018-08-12 15:43:48.815023126 +0100
++++ dkms-2.6.1/dkms.parallel_fix~ 2018-08-12 16:13:02.890385543 +0100
+@@ -693,10 +693,12 @@
+
+ # Use the generic make and make clean commands if not specified
+ if [[ $(VER $1) < $(VER 2.6.6) ]]; then
+- [[ ! $make_command ]] && make_command="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
++ [[ ! $make_command || $make_cooand == " $make_flags" ]] && \
++ make_command="make $nake_flags -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
+ [[ ! $clean ]] && clean="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build clean"
+ else
+- [[ ! $make_command ]] && make_command="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
++ [[ ! $make_command || $make_cooand == " $make_flags" ]] && \
++ make_command="make $make_flags -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
+ [[ ! $clean ]] && clean="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build clean"
+ fi
+
diff --git a/dkms-2.0.19-procconfig.patch b/dkms-2.6.1-procconfig.patch
similarity index 64%
rename from dkms-2.0.19-procconfig.patch
rename to dkms-2.6.1-procconfig.patch
index fff595d..e0591d2 100644
--- a/dkms-2.0.19-procconfig.patch
+++ b/dkms-2.6.1-procconfig.patch
@@ -1,6 +1,6 @@
---- dkms-2.0.19/dkms.procconfig 2009-03-11 11:36:32.000000000 +0100
-+++ dkms-2.0.19/dkms 2009-03-11 11:37:19.000000000 +0100
-@@ -899,12 +899,18 @@ function prepare_kernel()
+--- dkms-2.6.1/dkms 2018-08-10 15:04:15.002701863 +0100
++++ dkms-2.6.1/dkms.procconfig~ 2018-08-10 15:20:19.996172127 +0100
+@@ -1173,13 +1173,20 @@
else
config_arch=$2
fi
@@ -10,6 +10,7 @@
- done
- [ -z "$kernel_config" ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig"
- [ ! -e "$kernel_config" ] && kernel_config=""
+ fi
+ if [ "$1" == `uname -r` ] && [ -e "/proc/config.gz" ]; then
+ kernel_config="/proc/config.gz"
+ elif [ -e "/boot/config-$1" ]; then
@@ -22,32 +23,33 @@
+ [ -z "$kernel_config" ] && kernel_config="$kernel_source_dir/arch/$config_arch/defconfig"
+ [ ! -e "$kernel_config" ] && kernel_config=""
+ fi
- fi
++
elif [ -e /etc/redhat-release ] || [ -e /etc/fedora-release ]; then
- if [ -z "$kernel_config" ] && [ -d "$kernel_source_dir/configs" ]; then
-@@ -954,7 +960,11 @@ function prepare_kernel()
+ # Note this also applies to VMware 3.x
+ if [[ -z $kernel_config && -d $kernel_source_dir/configs ]]; then
+@@ -1234,7 +1241,11 @@
- if [ -n "$kernel_config" ]; then
- echo $"using $kernel_config"
-- cp -f "$kernel_config" .config
+ if [[ $kernel_config ]]; then
+ echo $"using $kernel_config"
+- cp -f "$kernel_config" .config
+ if file -b -i "$kernel_config" | grep -q "application/x-gzip"; then
+ zcat "$kernel_config" > .config
+ else
+ cp -f "$kernel_config" .config
+ fi
- elif [ -e .config ]; then
- echo $"using $kernel_source_dir/.config"
- echo $"(I hope this is the correct config for this kernel)"
-@@ -981,7 +991,11 @@ function prepare_kernel()
+ elif [[ -e .config ]]; then
+ warn $"Using $kernel_source_dir/.config" \
+ $"(I hope this is the correct config for this kernel)"
+@@ -1260,7 +1271,11 @@
- if [ -n "$kernel_config" ]; then
- echo $"using $kernel_config"
-- cp -f "$kernel_config" .config
+ if [[ $kernel_config ]]; then
+ echo $"using $kernel_config"
+- cp -f "$kernel_config" .config
+ if file -b -i "$kernel_config" | grep -q "application/x-gzip"; then
+ zcat "$kernel_config" > .config
+ else
+ cp -f "$kernel_config" .config
+ fi
- elif [ -e .config ]; then
- echo $"using $kernel_source_dir/.config"
- echo $"(I hope this is the correct config for this kernel)"
+ elif [[ -e .config ]]; then
+ warn $"using $kernel_source_dir/.config" \
+ $"(I hope this is the correct config for this kernel)"
diff --git a/dkms-2.6.1-suggest-devel-not-source.patch b/dkms-2.6.1-suggest-devel-not-source.patch
new file mode 100644
index 0000000..7be8693
--- /dev/null
+++ b/dkms-2.6.1-suggest-devel-not-source.patch
@@ -0,0 +1,11 @@
+--- dkms-2.6.1/dkms 2018-08-10 20:43:19.267491524 +0100
++++ /home/colin/Development/dkms/BUILD/dkms-2.6.1/dkms.suggests-devel~ 2018-08-10 20:47:43.846947358 +0100
+@@ -1147,7 +1147,7 @@
+
+ set_kernel_source_dir "$1"
+
+- # Check that kernel-source exists
++ # Check that kernel-devel exists
+ _check_kernel_dir "$1" || {
+ case "$running_distribution" in
+ Debian* | Ubuntu* )
diff --git a/dkms-2.2.0.3-symvers.patch b/dkms-2.6.1-symvers.patch
similarity index 58%
rename from dkms-2.2.0.3-symvers.patch
rename to dkms-2.6.1-symvers.patch
index 9114708..63cbdcb 100644
--- a/dkms-2.2.0.3-symvers.patch
+++ b/dkms-2.6.1-symvers.patch
@@ -1,6 +1,6 @@
---- dkms-2.2.0.3/dkms.symvers 2013-05-24 22:51:57.997690318 +0200
-+++ dkms-2.2.0.3/dkms 2013-05-24 22:53:26.332964500 +0200
-@@ -1269,6 +1269,11 @@ do_build()
+--- dkms-2.6.1/dkms 2018-08-10 20:13:48.188066453 +0100
++++ dkms-2.6.1/dkms.symvers~ 2018-08-10 20:22:13.950487577 +0100
+@@ -1380,6 +1380,11 @@
echo $"Building module:"
invoke_command "$clean" "cleaning build area" background
@@ -8,15 +8,15 @@
+ while [ "$count" -lt "${#built_module_name[@]}" ]; do
+ zcat $dkms_tree/*/kernel-${kernelver_array[0]}-${arch_array[0]}/module/symvers.gz > "${built_module_location[$count]}/Module.symvers" 2>/dev/null
+ count=$(($count+1))
-+ done
++ done
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}"
-@@ -1294,6 +1299,7 @@ do_build()
+ local the_make_command="${make_command/#make/make -j$parallel_jobs KERNELRELEASE=$kernelver}"
+@@ -1405,6 +1410,7 @@
# Save a copy of the new module
mkdir "$base_dir/module" >/dev/null
+ echo -n | gzip -c > "$dkms_tree/$module/$module_version/${kernelver_array[0]}/${arch_array[0]}/module/symvers.gz"
for ((count=0; count < ${#built_module_name[@]}; count++)); do
- [[ ${strip[$count]} != no ]] && strip -g "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_suffix"
- cp -f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_suffix" "$base_dir/module/${dest_module_name[$count]}$module_suffix" >/dev/null
+ [[ ${strip[$count]} != no ]] && strip -g "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix"
+ if [ "$module_compressed_suffix" = ".gz" ]; then
diff --git a/dkms-cleanup-after-removal.patch b/dkms-cleanup-after-removal.patch
index 725cd17..6f7dc35 100644
--- a/dkms-cleanup-after-removal.patch
+++ b/dkms-cleanup-after-removal.patch
@@ -1,21 +1,11 @@
-From: Andreas Beckmann <debian@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
-
-diff --git a/dkms b/dkms
-index 042acc0..c96cd8f 100644
---- dkms.old/dkms 2013-11-06 10:50:21.452660834 +0100
-+++ dkms/dkms 2013-11-06 10:50:26.685549748 +0100
-@@ -1621,6 +1621,9 @@
- 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
+--- dkms-2.6.1/dkms 2018-08-10 22:55:19.625335234 +0100
++++ dkms-2.6.1/dkms.cleanup~ 2018-08-10 23:01:44.784273583 +0100
+@@ -1828,7 +1828,7 @@
+ while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do
+ dir_to_remove="${dir_to_remove#/}"
+ done
+- (cd "$install_tree/$1" && rm -rf "${dir_to_remove}/*" && rmdir -p "${dir_to_remove}" || true)
++ (cd "$install_tree/$1" && rmdir --parents --ignore-fail-on-non-empty "${dir_to_remove}" || true)
+ echo $" - Original module"
+ local origmod=$(compressed_or_uncompressed "$dkms_tree/$module/original_module/$1/$2" "${dest_module_name[$count]}")
+ if [[ -n "$origmod" ]]; then
diff --git a/dkms-do-not-fail-on-modules-dir.patch b/dkms-do-not-fail-on-modules-dir.patch
deleted file mode 100644
index 93a5aa2..0000000
--- a/dkms-do-not-fail-on-modules-dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Andreas Beckmann <debian@abeckmann.de>
-Subject: do not fail if /lib/modules does not exist
-Bug-Debian: http://bugs.debian.org/666023
-
-diff --git a/dkms_common.postinst b/dkms_common.postinst
-index d8cf3a7..0c8cfc1 100644
---- dkms.old/dkms_common.postinst 2013-11-04 16:31:42.101991371 +0100
-+++ dkms/dkms_common.postinst 2013-11-04 16:40:04.854424946 +0100
-@@ -146,7 +146,7 @@
- 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/dkms-fix-zfs-autoinstall-failures-for-kernel-upgrades.patch b/dkms-fix-zfs-autoinstall-failures-for-kernel-upgrades.patch
deleted file mode 100644
index de3e9db..0000000
--- a/dkms-fix-zfs-autoinstall-failures-for-kernel-upgrades.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Mon, 4 Feb 2013 23:25:19 -0600
-Subject: Fix zfs autoinstall failures for kernel upgrades.
-
-The module dependency logic has a faulty assumption that fails if the dependee
-is built before the dependent during separate `dkms autoinstall` invocations.
-
-For example, if zfs-dkms is built after spl-dkms, and if `dkms autoinstall` is
-run separately for each, then it no-ops like the BUILD_DEPENDS is unsatisfied.
-
-Generate the installed_modules list early and move the dependency reduction
-logic to the top of the installation loop.
----
- dkms | 39 ++++++++++++++++++++++-----------------
- 1 file changed, 22 insertions(+), 17 deletions(-)
-
-diff --git a/dkms b/dkms
-index 213cbd6..3aa4d3e 100644
---- dkms.old/dkms 2013-11-06 10:28:58.159976925 +0100
-+++ dkms/dkms 2013-11-06 10:31:59.973091988 +0100
-@@ -3186,8 +3186,14 @@
- 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
-@@ -3219,7 +3225,18 @@
- install_count=0
- next_install=( )
-
-- # Step 1: Install modules that have an empty depdendency list.
-+ # Step 1: Remove installed modules from all dependency lists.
-+ for m in ${!build_depends[@]}; do
-+ for d in ${build_depends[$m]}; do
-+ for i in ${installed_modules[@]}; do
-+ [[ "$d" = "$i" ]] && break 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
-@@ -3233,23 +3250,11 @@
-
- wait
-
-- # Step 2: Keep going if at least one module was installed during
-+ # Step 3: Keep going if at least one module was installed during
- # this iteration.
- [[ "$install_count" -gt 0 ]] || break;
-
-- # Step 3: Remove modules that were installed during Step 1 from
-- # the dependency lists of all other modules.
-- for m in ${!build_depends[@]}; do
-- for d in ${build_depends[$m]}; do
-- for i in ${installed_modules}; do
-- [[ "$d" = "$i" ]] && break 2
-- done
-- next_depends+="$d "
-- done
-- build_depends[$m]="${next_depends%% }"
-- done
--
-- # Step 4: Remove modules that were installed during Step 1 from
-+ # Step 4: Remove modules that were installed during Step 2 from
- # the job queue.
- to_install=( "${next_install[@]}" )
- done
diff --git a/dkms-man.patch b/dkms-man.patch
deleted file mode 100644
index 85cb3ff..0000000
--- a/dkms-man.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur dkms.old/dkms.8 dkms/dkms.8
---- dkms.old/dkms.8 2013-11-06 10:25:33.980330455 +0100
-+++ dkms/dkms.8 2013-11-06 10:27:03.426424552 +0100
-@@ -1,4 +1,42 @@
- .\" -*- nroff -*-
-+.\"
-+.\" .SY, .YS, .OP macros from /usr/share/groff/1.21/tmac/an-ext.tmac
-+.\"
-+.\" Declare start of command synopsis. Sets up hanging indentation.
-+.de SY
-+. ie !\\n(mS \{\
-+. nh
-+. nr mS 1
-+. nr mA \\n(.j
-+. ad l
-+. nr mI \\n(.i
-+. \}
-+. el \{\
-+. br
-+. ns
-+. \}
-+.
-+. HP \w'\fB\\$1\fP\ 'u
-+. B "\\$1"
-+..
-+.
-+.
-+.\" End of command synopsis. Restores adjustment.
-+.de YS
-+. in \\n(mIu
-+. ad \\n(mA
-+. hy \\n(HY
-+. nr mS 0
-+..
-+.
-+.
-+.\" Declare optional option.
-+.de OP
-+. ie \\n(.$-1 \
-+. RI "[\fB\\$1\fP" "\ \\$2" "]"
-+. el \
-+. RB "[" "\\$1" "]"
-+..
- .TH DKMS 8 "June 2008" "Version 2.0.20"
- .SH NAME
- dkms \- Dynamic Kernel Module Support
diff --git a/dkms-reset-build-dependencies.patch b/dkms-reset-build-dependencies.patch
deleted file mode 100644
index 64f4f3f..0000000
--- a/dkms-reset-build-dependencies.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 20 Mar 2013 14:31:31 -0700
-Subject: Reset build dependencies
-
-For each iteration we need to rebuild ithe list of uninstalled
-build dependencies. To do this next_depends must be reset for
-each pass so it can be recalculated. Otherwise, we can hit the
-install_count early return and not install all the requested
-packages.
-
-The code should also use 'continue 2' instead of 'break 2' to
-ensure the full list of build_depends is checked.
----
- dkms | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dkms b/dkms
-index 73071ea..d88237e 100644
---- dkms.old/dkms 2013-11-06 10:53:18.000909678 +0100
-+++ dkms/dkms 2013-11-06 11:02:33.168239217 +0100
-@@ -3227,9 +3227,10 @@
-
- # 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" ]] && break 2
-+ [[ "$d" = "$i" ]] && continue 2
- done
- next_depends+="$d "
- done
diff --git a/dkms-use-STRIP-0-as-the-default-for-the-STRIP-array.patch b/dkms-use-STRIP-0-as-the-default-for-the-STRIP-array.patch
deleted file mode 100644
index 3c70058..0000000
--- a/dkms-use-STRIP-0-as-the-default-for-the-STRIP-array.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Fri, 28 Dec 2012 11:04:07 -0600
-Subject: Use STRIP[0] as the default for the STRIP array.
-
-If STRIP[0]='no' is set for the first module in a dkms.conf file,
-then all other modules are usually built the same way. Producing
-stripped and unstripped modules in the same build is rarely useful.
-
-Thus, if STRIP[0] is explicitly set, then use it as the default
-value for all other unset entries in the STRIP array.
----
- dkms | 3 ++-
- dkms.8 | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/dkms b/dkms
-index 9355f4e..fdc9d77 100644
---- dkms.old/dkms 2013-11-06 10:28:00.121215472 +0100
-+++ dkms/dkms 2013-11-06 10:28:07.809051459 +0100
-@@ -526,7 +526,8 @@
- esac
- case ${STRIP[$index]} in
- [nN]*) strip[$index]="no";;
-- *) strip[$index]="yes";;
-+ [yY]*) strip[$index]="yes";;
-+ '') strip[$index]=${strip[0]:-yes};;
- esac
-
- # If unset, set by defaults
-diff -Naur dkms.old/dkms.8 dkms/dkms.8
---- dkms.old/dkms.8 2013-11-06 10:27:36.761713734 +0100
-+++ dkms/dkms.8 2013-11-06 10:28:07.809051459 +0100
-@@ -765,6 +765,7 @@
- .B STRIP[#]=
- By default strip is considered to be "yes". If set to "no", DKMS will not
- run strip \-g against your built module to remove debug symbols from it.
-+STRIP[0] is used as the default for any unset entries in the STRIP array.
- .TP
- .B PACKAGE_NAME=
- This directive is used to give the name associated with the entire package of modules. This is the same
diff --git a/dkms.-bb.2018-08-12-18-33-17.08679.itchka64.buildlog b/dkms.-bb.2018-08-12-18-33-17.08679.itchka64.buildlog
new file mode 100644
index 0000000..52abb0d
--- /dev/null
+++ b/dkms.-bb.2018-08-12-18-33-17.08679.itchka64.buildlog
@@ -0,0 +1,195 @@
+Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.84249
++ umask 022
++ cd /home/colin/Development/dkms/BUILD
++ '[' 1 -eq 1 ']'
++ '[' 1 -eq 1 ']'
++ '[' 1 -eq 1 ']'
++ cd /home/colin/Development/dkms/BUILD
++ rm -rf dkms-2.6.1
++ /bin/tar -xf /home/colin/Development/dkms/v2.6.1.tar.gz
++ cd dkms-2.6.1
++ echo 'Patch #2 (dkms-2.6.1-mdkize.patch):'
+Patch #2 (dkms-2.6.1-mdkize.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-mdkize.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .mdkize~
+patching file dkms
++ echo 'Patch #7 (dkms-2.6.1-procconfig.patch):'
+Patch #7 (dkms-2.6.1-procconfig.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-procconfig.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .procconfig~
+patching file dkms
++ echo 'Patch #8 (dkms-2.6.1-mdkrpm-split-ver-rel.patch):'
+Patch #8 (dkms-2.6.1-mdkrpm-split-ver-rel.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-mdkrpm-split-ver-rel.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .mdkrpm-split-ver-rel~
+patching file dkms
++ echo 'Patch #10 (dkms-2.6.1-binary_only.patch):'
+Patch #10 (dkms-2.6.1-binary_only.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-binary_only.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .binary_only~
+patching file dkms
++ echo 'Patch #11 (dkms-2.6.1-min-max-kernel.patch):'
+Patch #11 (dkms-2.6.1-min-max-kernel.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-min-max-kernel.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .min-max-kernel~
+patching file dkms
++ echo 'Patch #17 (dkms-2.6.1-autoalias.patch):'
+Patch #17 (dkms-2.6.1-autoalias.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-autoalias.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .autoalias~
+patching file dkms
++ echo 'Patch #18 (dkms-2.6.1-mkrpm_status.patch):'
+Patch #18 (dkms-2.6.1-mkrpm_status.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-mkrpm_status.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .mkrpm~
+patching file dkms
++ echo 'Patch #22 (dkms-2.6.1-symvers.patch):'
+Patch #22 (dkms-2.6.1-symvers.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-symvers.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .symvers~
+patching file dkms
++ echo 'Patch #24 (dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch):'
+Patch #24 (dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .generic-prepare~
+patching file dkms
++ echo 'Patch #25 (dkms-2.6.1-suggest-devel-not-source.patch):'
+Patch #25 (dkms-2.6.1-suggest-devel-not-source.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-suggest-devel-not-source.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .suggests-devel~
+patching file dkms
++ echo 'Patch #29 (dkms-cleanup-after-removal.patch):'
+Patch #29 (dkms-cleanup-after-removal.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-cleanup-after-removal.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .cleanup~
+patching file dkms
++ echo 'Patch #35 (dkms-2.6.1-dont_fail_if_module_source_removed.patch):'
+Patch #35 (dkms-2.6.1-dont_fail_if_module_source_removed.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-dont_fail_if_module_source_removed.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .dontfail~
+patching file dkms
++ echo 'Patch #37 (dkms-2.6.1-parallel_fix.patch):'
+Patch #37 (dkms-2.6.1-parallel_fix.patch):
++ /bin/cat /home/colin/Development/dkms/dkms-2.6.1-parallel_fix.patch
++ /usr/bin/patch --fuzz=0 -U -p1 -b --suffix .parallel_fix~
+patching file dkms
++ exit 0
+Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.84249
++ umask 022
++ cd /home/colin/Development/dkms/BUILD
++ /bin/rm -rf /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot
++ /bin/mkdir -p /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot
++ cd dkms-2.6.1
++ '[' 1 -eq 1 ']'
++ make DESTDIR=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot install 'INSTALL=install -p' INITD=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/rc.d/init.d SBIN=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/sbin VAR=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/var/lib/dkms MAN=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/man/man8 ETC=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/dkms BASHDIR=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/bash_completion.d LIBDIR=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/lib/dkms
+mkdir -m 0755 -p /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/var/lib/dkms /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/sbin /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/man/man8 /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/dkms /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/bash_completion.d /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/lib/dkms
+sed -e "s/\[INSERT_VERSION_HERE\]/2.6/" dkms > dkms.versioned
+mv -f dkms.versioned dkms
+install -p -m 0755 dkms_common.postinst /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/lib/dkms/common.postinst
+install -p -m 0755 dkms /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/sbin
+install -p -m 0755 dkms_autoinstaller /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/lib/dkms
+install -p -m 0644 dkms_framework.conf /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/dkms/framework.conf
+install -p -m 0644 dkms_dbversion /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/var/lib/dkms
+install -p -m 0644 dkms.bash-completion /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/bash_completion.d/dkms
+# install compressed manpage with proper timestamp and permissions
+gzip -c -9 dkms.8 > /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/man/man8/dkms.8.gz
+chmod 0644 /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/man/man8/dkms.8.gz
+touch --reference=dkms.8 /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/man/man8/dkms.8.gz
+mkdir -p -m 0755 /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/kernel/prerm.d /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/kernel/postinst.d
+install -p -m 0755 kernel_prerm.d_dkms /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/kernel/prerm.d/dkms
+install -p -m 0755 kernel_postinst.d_dkms /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/kernel/postinst.d/dkms
++ install -m644 -p /home/colin/Development/dkms/dkms-mkrpm.spec.template -D /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/dkms/template-dkms-mkrpm.spec
++ install -m755 -p dkms_mkkerneldoth -D /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/sbin/dkms_mkkerneldoth
++ rm /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/lib/dkms/dkms_autoinstaller
++ install -m755 -p /home/colin/Development/dkms/autoload.awk /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/sbin/dkms_autoload
++ mkdir -p /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/var/lib/dkms-binary
++ install -m644 -p /home/colin/Development/dkms/dkms.depmod.conf -D /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/etc/depmod.d/dkms.conf
++ install -m644 -p /home/colin/Development/dkms/dkms.service -D /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/lib/systemd/system/dkms.service
++ install -d /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/lib/systemd/system-preset
++ cat
++ '[' -n '' ']'
++ /usr/share/spec-helper/clean_files
++ '[' -n '' ']'
++ COMPRESS='xz -0f --text -T0'
++ COMPRESS_EXT=.xz
++ /usr/lib/rpm/brp-compress
++ '[' -n '' ']'
++ /usr/share/spec-helper/relink_symlinks
++ '[' -n '' ']'
++ /usr/share/spec-helper/clean_perl
++ '[' -n '' ']'
++ /usr/share/spec-helper/lib_symlinks
++ '[' -n '' ']'
++ /usr/share/spec-helper/gprintify
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_mo
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_xdg
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_file_permissions
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_pamd
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_pkgconfig
++ '[' -n '' ']'
++ /usr/share/spec-helper/remove_info_dir
++ '[' -n '' ']'
++ /usr/share/spec-helper/remove_libtool_files
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_eol
++ '[' -n '' ']'
++ /usr/share/spec-helper/check_elf_files
++ '[' -n '' ']'
++ /usr/share/spec-helper/remove_rpath
++ '[' -n '' ']'
++ export DISABLE_DEBUG=1
++ DISABLE_DEBUG=1
++ /usr/lib/rpm/find-debuginfo.sh -r /home/colin/Development/dkms/BUILD/dkms-2.6.1
+
+Processing files: dkms-2.6.1-1.noarch
+Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.16308
++ umask 022
++ cd /home/colin/Development/dkms/BUILD
++ cd dkms-2.6.1
++ DOCDIR=/home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/doc/dkms
++ export DOCDIR
++ /bin/mkdir -p /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/doc/dkms
++ cp -pr sample.spec sample.conf AUTHORS template-dkms-mkrpm.spec /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/doc/dkms
++ '[' -n '' ']'
++ /usr/share/spec-helper/fix_eol /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/doc/dkms
++ '[' -n '' ']'
++ /usr/share/spec-helper/clean_files /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot/usr/share/doc/dkms
+Skipping R: '/bin/awk'
+Removing dependency on self: R config(dkms) = 0:2.6.1-1:2015.0
+Provides: config(dkms) = 0:2.6.1-1:2015.0 dkms-minimal = 2.6.1-1:2015.0
+Requires(pre): coreutils cpio file findutils gawk gcc >= 7.2.1_2017.11-3 gcc-cpp grep kmod lsb-release make patch pkgconfig(libelf) >= 0.170 sed which
+Requires(post): systemd
+Requires(postun): systemd
+Obsoletes: dkms-minimal < 2.6.1-1:2015.0
+Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot
+Wrote: /home/colin/Development/dkms/RPMS/noarch/dkms-2.6.1-1-omv2015.0.noarch.rpm
+Executing "/usr/bin/rpmlint -T -f /home/colin/Development/dkms/dkms.rpmlintrc /home/colin/Development/dkms/RPMS/noarch/dkms-2.6.1-1-omv2015.0.noarch.rpm":
+dkms.noarch: W: only-non-binary-in-usr-lib
+
+dkms.noarch: W: not-standard-release-extension 1
+
+dkms.noarch: W: non-conffile-in-etc /etc/bash_completion.d/dkms
+
+dkms.noarch: W: non-conffile-in-etc /etc/depmod.d/dkms.conf
+
+dkms.noarch: W: no-packager-tag
+
+dkms.noarch: W: no-manual-page-for-binary dkms_mkkerneldoth
+
+dkms.noarch: W: no-manual-page-for-binary dkms_autoload
+
+dkms.noarch: E: devel-dependency (Badness: 1) kernel-devel
+
+dkms.noarch: W: dangerous-command-in-%trigger rm
+
+1 packages and 0 specfiles checked; 1 errors, 8 warnings.
+Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.4196
++ umask 022
++ cd /home/colin/Development/dkms/BUILD
++ cd dkms-2.6.1
++ /bin/rm -rf /home/colin/Development/dkms/BUILDROOT/dkms-2.6.1-1-omv2015.0.noarch-buildroot
diff --git a/dkms.spec b/dkms.spec
index 13b85f1..885263a 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -2,10 +2,9 @@
Summary: Dynamic Kernel Module Support Framework
Name: dkms
-Version: 2.2.0.3.1
-URL: http://linux.dell.com/dkms
-%define gitdate 20130827
-Release: 3.%{gitdate}.15
+Version: 2.6.1
+URL: https://github.com/dell/dkms
+Release: 2
License: GPLv2+
Group: System/Base
BuildArch: noarch
@@ -30,37 +29,26 @@ Requires(pre): pkgconfig(libelf) >= 0.170
Requires(post,postun): systemd
%rename %{name}-minimal
# unofficial version, git rev a62d38d49148871c6b17636f31c93f986d31c914
-Source0: http://linux.dell.com/dkms/permalink/%{name}-%{version}.tar.xz
+Source0: https://github.com/dell/dkms/archive/v%{version}.tar.gz
Source1: dkms-mkrpm.spec.template
Source2: dkms.depmod.conf
Source3: autoload.awk
Source4: dkms.service
Patch1: dkms-2.0.19-norpm.patch
-Patch2: dkms-2.2.0.3-mdkize.patch
-Patch4: dkms-2.2.0.3-compressed-module.patch
-Patch7: dkms-2.2.0.3-procconfig.patch
-Patch8: dkms-2.2.0.3-mdkrpm-split-ver-rel.patch
-Patch10: dkms-2.2.0.3-binary_only.patch
-Patch11: dkms-2.2.0.3-min-max-kernel.patch
-Patch17: dkms-2.2.0.3-autoalias.patch
-Patch18: dkms-2.2.0.3-mkrpm_status.patch
-Patch21: dkms-2.2.0.3-init-mdv-interactive.patch
-Patch22: dkms-2.2.0.3-symvers.patch
-Patch24: dkms-2.2.0.3-generic-preparation-for-2.6.39-and-higher.patch
-Patch25: dkms-2.2.0.3-suggest-devel-not-source.patch
-Patch26: dkms-2.2.0.3.1-xz-support.patch
-Patch27: dkms-2.2.0.3-parallel-build.patch
-Patch28: dkms-man.patch
+Patch2: dkms-2.6.1-mdkize.patch
+Patch7: dkms-2.6.1-procconfig.patch
+Patch8: dkms-2.6.1-mdkrpm-split-ver-rel.patch
+Patch10: dkms-2.6.1-binary_only.patch
+Patch11: dkms-2.6.1-min-max-kernel.patch
+Patch17: dkms-2.6.1-autoalias.patch
+Patch18: dkms-2.6.1-mkrpm_status.patch
+Patch22: dkms-2.6.1-symvers.patch
+Patch24: dkms-2.6.1-generic-preparation-for-2.6.39-and-higher.patch
+Patch25: dkms-2.6.1-suggest-devel-not-source.patch
Patch29: dkms-cleanup-after-removal.patch
-Patch30: dkms-do-not-fail-on-modules-dir.patch
-Patch31: dkms-use-STRIP-0-as-the-default-for-the-STRIP-array.patch
-Patch32: dkms-2.2.0.3.1-add-dependency-logic-for-automatic-builds.patch
-Patch33: dkms-fix-zfs-autoinstall-failures-for-kernel-upgrades.patch
-Patch34: dkms-reset-build-dependencies.patch
-Patch35: dkms-2.2.0.3-dont_fail_if_module_source_removed.patch
-Patch36: dkms-2.2.0.3-fix_obsolete_modules_check.patch
-Patch37: dkms-2.2.0.3-parallel_fix.patch
+Patch35: dkms-2.6.1-dont_fail_if_module_source_removed.patch
+Patch37: dkms-2.6.1-parallel_fix.patch
%define _dkmsdir %{_localstatedir}/lib/%{name}
%define _dkmsbinarydir %{_localstatedir}/lib/%{name}-binary
@@ -75,30 +63,19 @@ This package is intended for building binary kernel
modules with dkms source packages installed
%prep
-%setup -q
+%setup -q
%patch2 -p1 -b .mdkize~
-%patch4 -p1 -b .compressed-module~
%patch7 -p1 -b .procconfig~
%patch8 -p1 -b .mdkrpm-split-ver-rel~
%patch10 -p1 -b .binary_only~
%patch11 -p1 -b .min-max-kernel~
%patch17 -p1 -b .autoalias~
%patch18 -p1 -b .mkrpm~
-%patch21 -p1 -b .mdv-interactive~
%patch22 -p1 -b .symvers~
%patch24 -p1 -b .generic-prepare~
%patch25 -p1 -b .suggests-devel~
-%patch26 -p1 -b .xz_support~
-%patch27 -p1 -b .parallel~
-%patch28 -p1 -b .man~
%patch29 -p1 -b .cleanup~
-%patch30 -p1 -b .nofail~
-%patch31 -p1 -b .strip0~
-%patch32 -p1 -b .autodeplogic~
-%patch33 -p1 -b .zfs~
-%patch34 -p1 -b .resetdeps~
%patch35 -p1 -b .dontfail~
-%patch36 -p1 -b .obs_mod_check~
%patch37 -p1 -b .parallel_fix~
%install