Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / 
dkms


Commits:
624641d6 by Peter Jung at 2024-10-14T23:29:47+02:00
dkms: Refactor && SPDX && cherry-pick for kmod33 weakdep

Signed-off-by: Peter Jung <[email protected]>

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -5,16 +5,16 @@ pkgbase = dkms
        url = https://github.com/dell/dkms
        install = dkms.install
        arch = any
-       license = GPL2
+       license = GPL-2.0-or-later
        makedepends = git
-       depends = coreutils
        depends = bash
+       depends = coreutils
        depends = gawk
-       depends = sed
-       depends = kmod
        depends = gcc
+       depends = kmod
        depends = make
        depends = patch
+       depends = sed
        optdepends = linux-headers: build modules against the Arch kernel
        optdepends = linux-lts-headers: build modules against the LTS kernel
        optdepends = linux-zen-headers: build modules against the ZEN kernel
@@ -25,10 +25,10 @@ pkgbase = dkms
        source = hook.remove
        source = hook.upgrade
        source = hook.sh
-       sha256sums = SKIP
-       sha256sums = 
acdc5b45cc018cea04ee1aec56fd8fc3a2de62cf7bc41acf53b3790872120998
-       sha256sums = 
326515cc7d00f93760beb844434ca7442caf7a9424614aa95a8f6d1ab79e15df
-       sha256sums = 
4f8dff7716e73a8bba885638f12e3cdc9e87daec1896f75e700b981527e43870
+       sha256sums = 
bb6362bdd04d441dd0f5b7ad46e639b1c73878179d275c8366f78e6217dc38b4
+       sha256sums = 
da2dd53bdb427c3ffbe793fd05f898d8a0545e6dbd346c85fad1717b0f838c62
+       sha256sums = 
497422e72b2f10a71caae40c44a07b215425d393acb365700e38944e09f9a554
+       sha256sums = 
cc04280e8eb095f4950f5e3c6b2997fbc8d5862d79c5ae29d5943b8ac204d0d4
        sha256sums = 
c1b4a4e2e4e0e0e59ee0887403e79d60b209f3878dbbec6612573f13b90cce01
 
 pkgname = dkms


=====================================
PKGBUILD
=====================================
@@ -7,9 +7,20 @@ pkgrel=1
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='https://github.com/dell/dkms'
-license=('GPL2')
-depends=('coreutils' 'bash' 'gawk' 'sed' 'kmod' 'gcc' 'make' 'patch')
-makedepends=('git')
+license=(GPL-2.0-or-later)
+depends=(
+  bash
+  coreutils
+  gawk
+  gcc
+  kmod
+  make
+  patch
+  sed
+)
+makedepends=(
+  git
+)
 optdepends=('linux-headers: build modules against the Arch kernel'
             'linux-lts-headers: build modules against the LTS kernel'
             'linux-zen-headers: build modules against the ZEN kernel'
@@ -21,12 +32,20 @@ source=("git+https://github.com/dell/dkms.git#tag=v$pkgver";
         'hook.remove'
         'hook.upgrade'
         'hook.sh')
-sha256sums=('SKIP'
+sha256sums=('bb6362bdd04d441dd0f5b7ad46e639b1c73878179d275c8366f78e6217dc38b4'
             'da2dd53bdb427c3ffbe793fd05f898d8a0545e6dbd346c85fad1717b0f838c62'
             '497422e72b2f10a71caae40c44a07b215425d393acb365700e38944e09f9a554'
             'cc04280e8eb095f4950f5e3c6b2997fbc8d5862d79c5ae29d5943b8ac204d0d4'
             'c1b4a4e2e4e0e0e59ee0887403e79d60b209f3878dbbec6612573f13b90cce01')
 
+prepare() {
+  cd dkms
+  # Since kmod 33 it generates "weakdep"
+  # This puts a leftover in /usr/lib/modules
+  # https://github.com/dell/dkms/issues/437
+  git cherry-pick -n a894e3b0bd1b511baba1c9c515322811566fbef9
+}
+
 package() {
   # alpm hooks
   install -D -m 644 hook.install 
"$pkgdir/usr/share/libalpm/hooks/70-dkms-install.hook"



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/dkms/-/commit/624641d64942509c8dd22296b352e6b55b78b1d9

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/dkms/-/commit/624641d64942509c8dd22296b352e6b55b78b1d9
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to