Accepting request 1123670 from home:breadyx_:branches:X11:Bumblebee

Update to 3.0.12

OBS-URL: https://build.opensuse.org/request/show/1123670
OBS-URL: https://build.opensuse.org/package/show/X11:Bumblebee/dkms?expand=0&rev=35

dkms-3.0.11.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5582aa7ab1815d23c63adc09fdf96f04842381a76471d205f3b183e90b3d4d1
-size 93521

dkms-3.0.12.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bf138c3427b1e9fda046efeef8414a5d738e9e3aca0e0bae10aabde9da99f28
+size 90239

dkms.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Oct 27 07:43:34 UTC 2023 - Alexandru Gabriel Bradatan <alex.bradatan85@yahoo.it>
+
+- Update to 3.0.12
+  * Fix CC detection
+  * Makefile: fix extension of kernel-install plugin
+  * Fix grammatical error
+  * Remove embedded DESTDIR in make variables, honour them
+- Drop patch `fix-kernel-postinst_d.patch` (fixed by upstream)
+- Remove leftover dkms.default
+
 -------------------------------------------------------------------
 Sun Sep 17 20:45:05 UTC 2023 - Alexandru Gabriel Bradatan <alex.bradatan85@yahoo.it>
 

dkms.default

@@ -1,9 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-# With LOAD set to yes, modules listed as installed will be loaded with
-# systemctl start dkms.service. Default is yes.
-LOAD=yes
-
-# With UNLOAD set to yes, modules listed as installed will be unloaded with
-# systemctl stop dkms.service. Default is no.
-UNLOAD=no

dkms.spec

@@ -17,19 +17,16 @@
 
 
 Name:           dkms
-Version:        3.0.11
+Version:        3.0.12
 Release:        0
 Summary:        Dynamic Kernel Module Support Framework
 License:        GPL-2.0-only
 Group:          System/Kernel
 URL:            https://github.com/dell/dkms
 Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source3:        dkms.default
 Source100:      %{name}.rpmlintrc
-# PATCH-FIX-OPENSUSE fix-kernel-postinst_d.patch boo#1194723
-Patch1:         fix-kernel-postinst_d.patch
 # PATCH-FIX-OPENSUSE fix-weak-modules_dkms_in.patch boo#1194723
-Patch2:         fix-weak-modules_dkms_in.patch
+Patch1:         fix-weak-modules_dkms_in.patch
 BuildRequires:  make
 BuildRequires:  pkgconfig(systemd)
 Requires:       bash > 1.99
@@ -57,30 +54,28 @@ module RPMS as originally developed by Dell.
 
 %prep
 %setup -q
-%autopatch -p1 1 2
+%autopatch -p1 1
 
 %build
 
 %install
+# Note: the makefile changed and has the following gotchas:
+# 1. Defined variables should not contain buildroot, the given
+#    paths are concatenated with DESTDIR (which has buildroot) by
+#    the makefile
+# 2. BASHDIR, ETC and VAR are not settable
 %make_install \
-  SBIN=%{buildroot}%{_sbindir} \
+  SBIN=%{_sbindir} \
-  VAR=%{buildroot}%{_localstatedir}/lib/%{name} \
+  MAN=%{_mandir}/man8 \
-  MAN=%{buildroot}%{_mandir}/man8 \
+  LIBDIR=%{_libexecdir}/%{name} \
-  ETC=%{buildroot}%{_sysconfdir}/%{name} \
+  KCONF=%{_sysconfdir}/kernel
-  BASHDIR=%{buildroot}%{_datadir}/bash-completion/completions \
-  LIBDIR=%{buildroot}%{_libexecdir}/%{name}
 
 install -p -m 755 -D kernel_install.d_dkms \
 	%{buildroot}%{_prefix}/lib/kernel/install.d/40-%{name}.install
 
-# Required due to changes in kernel-install
-mv %{buildroot}%{_sysconfdir}/kernel/install.d/%{name} \
-   %{buildroot}%{_sysconfdir}/kernel/install.d/40-%{name}.install
-
 # systemd
 install -p -m 644 -D dkms.service %{buildroot}%{_unitdir}/dkms.service
 
-install -m 644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/default/dkms
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdkms
 
 sed -i \
@@ -132,7 +127,6 @@ exit 0
 %{_sysconfdir}/kernel/install.d/40-%{name}.install
 %{_datadir}/bash-completion/completions/%{name}
 %{_unitdir}/dkms.service
-%config %{_sysconfdir}/default/dkms
 # these dirs are for plugins - owned by other packages
 %dir %{_sysconfdir}/kernel
 %dir %{_sysconfdir}/kernel/postinst.d

fix-kernel-postinst_d.patch

@@ -1,13 +0,0 @@
---- dkms-3.0.11/kernel_postinst.d_dkms.orig	2023-05-13 12:40:20.897356596 +0200
-+++ dkms-3.0.11/kernel_postinst.d_dkms	2023-05-13 12:40:33.365656164 +0200
-@@ -34,8 +34,8 @@ case "${uname_s}" in
-     ;;
- esac
- 
--if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then
--    exec /usr/lib/dkms/dkms_autoinstaller start "$inst_kern"
-+if [ -x /usr/libexec/dkms/dkms_autoinstaller ]; then
-+    exec /usr/libexec/dkms/dkms_autoinstaller start "$inst_kern"
- fi
- 
- if ! _check_kernel_dir "$inst_kern" ; then

fix-weak-modules_dkms_in.patch

@@ -1,5 +1,5 @@
---- dkms-3.0.11/dkms.in.orig	2023-05-13 12:42:02.523798339 +0200
+--- dkms-3.0.12/dkms.in.orig	2023-05-13 12:42:02.523798339 +0200
-+++ dkms-3.0.11/dkms.in	2023-05-13 12:42:31.580496476 +0200
++++ dkms-3.0.12/dkms.in	2023-05-13 12:42:31.580496476 +0200
 @@ -2564,7 +2564,9 @@ fi
  
  # Since initramfs/initrd rebuild is not requested, skip it with Redhat's weak-modules