update to 2.3 [release 2.3-1mamba;Sat Dec 17 2016]
This commit is contained in:
parent
4bfff59189
commit
6af0a857bf
@ -1,20 +1,20 @@
|
||||
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 @@
|
||||
diff -ru dkms-2.3/dkms dkms-2.3.patched/dkms
|
||||
--- dkms-2.3/dkms 2016-12-17 17:42:56.000000000 +0100
|
||||
+++ dkms-2.3.patched/dkms 2016-12-17 17:47:06.448995920 +0100
|
||||
@@ -512,8 +512,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"
|
||||
+ 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."
|
||||
- $"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 @@
|
||||
$last_mvka_conf = $(readlink -f $read_conf_file) ]] && return
|
||||
@@ -1550,6 +1553,7 @@
|
||||
is_module_added() {
|
||||
[[ $1 && $2 ]] || return 1
|
||||
[[ -d $dkms_tree/$1/$2 ]] || return 2
|
23
dkms.spec
23
dkms.spec
@ -1,16 +1,16 @@
|
||||
Name: dkms
|
||||
Version: 2.2.0.3
|
||||
Release: 4mamba
|
||||
Version: 2.3
|
||||
Release: 1mamba
|
||||
Summary: Dynamic Kernel Module Support
|
||||
Group: System/Tools
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>
|
||||
URL: http://linux.dell.com/projects.shtml#dkms
|
||||
Source: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
|
||||
Source: https://github.com/dell/dkms.git/%{version}/dkms-%{version}.tar.bz2
|
||||
Source1: dkms.service
|
||||
Source2: dkms.systemd
|
||||
Patch0: dkms-2.2.0.3-dont_fail_if_module_source_removed.patch
|
||||
Patch0: dkms-2.3-dont_fail_if_module_source_removed.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
## AUTOBUILDREQ-END
|
||||
@ -23,18 +23,18 @@ DKMS stands for Dynamic Kernel Module Support. It is designed to create a framew
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
#%patch0 -p1
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
make install-redhat DESTDIR=%{buildroot}
|
||||
make install-redhat-systemd DESTDIR=%{buildroot} SYSTEMD=%{buildroot}%{_unitdir}
|
||||
|
||||
install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/dkms.service
|
||||
install -D -m0755 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/scripts/dkms
|
||||
#install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/dkms.service
|
||||
#install -D -m0755 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/scripts/dkms
|
||||
|
||||
rm -f %{buildroot}%{_initrddir}/dkms_autoinstaller
|
||||
#rm -f %{buildroot}%{_initrddir}/dkms_autoinstaller
|
||||
|
||||
install -d %{buildroot}%{_presetdir}
|
||||
cat > %{buildroot}%{_presetdir}/50-dkms.preset << _EOF
|
||||
@ -85,12 +85,15 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
|
||||
%{_localstatedir}/lib/dkms/dkms_dbversion
|
||||
%{_presetdir}/50-dkms.preset
|
||||
%{_unitdir}/dkms.service
|
||||
%{_prefix}/lib/systemd/scripts/dkms
|
||||
#%{_prefix}/lib/systemd/scripts/dkms
|
||||
%{_mandir}/man8/dkms.8*
|
||||
%doc AUTHORS COPYING
|
||||
#README.dkms TODO
|
||||
|
||||
%changelog
|
||||
* Sat Dec 17 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.3-1mamba
|
||||
- update to 2.3
|
||||
|
||||
* Sat Dec 13 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.0.3-4mamba
|
||||
- sysv -> systemd switch
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user