[arch-commits] Commit in dkms/trunk (2 files)

[Jan Steffens]

    Date: Friday, November 12, 2021 @ 20:30:49
  Author: heftig
Revision: 427942

3.0.0-2: fix building packages modules

Added:
  dkms/trunk/0001-Fix-creation-of-temp-build-dir.patch
Modified:
  dkms/trunk/PKGBUILD

-------------------------------------------+
 0001-Fix-creation-of-temp-build-dir.patch |   29 ++++++++++++++++++++++++++++
 PKGBUILD                                  |    4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

Added: 0001-Fix-creation-of-temp-build-dir.patch
===================================================================
--- 0001-Fix-creation-of-temp-build-dir.patch	                        (rev 0)
+++ 0001-Fix-creation-of-temp-build-dir.patch	2021-11-12 20:30:49 UTC (rev 427942)
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig at archlinux.org>
+Date: Fri, 12 Nov 2021 20:25:22 +0000
+Subject: [PATCH] Fix creation of temp build dir
+
+Since `$source_dir` is just a symlink to the actual source directory,
+using `cp -a` on it just copies the symlink instead of the contents.
+
+This makes the build fail when the source directory isn't writable.
+
+Commit d038a604bf525b01d7bd12b98706b1f861e4ea27 broke this when it
+dropped the trailing slash.
+---
+ dkms.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dkms.in b/dkms.in
+index c907d1f60a61..115eb062a382 100644
+--- a/dkms.in
++++ b/dkms.in
+@@ -872,7 +872,7 @@ prepare_build()
+ 
+     # Set up temporary build directory for build
+     rm -rf "$build_dir"
+-    cp -a "$source_dir" "$build_dir"
++    cp -a "$source_dir/" "$build_dir"
+ 
+     cd "$build_dir"
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-12 20:28:54 UTC (rev 427941)
+++ PKGBUILD	2021-11-12 20:30:49 UTC (rev 427942)
@@ -3,7 +3,7 @@
 
 pkgname=dkms
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='https://github.com/dell/dkms'
@@ -17,11 +17,13 @@
 backup=('etc/dkms/framework.conf')
 install=$pkgname.install
 source=("git+https://github.com/dell/dkms.git#tag=v$pkgver"
+        '0001-Fix-creation-of-temp-build-dir.patch'
         'hook.install'
         'hook.remove'
         'hook.upgrade'
         'hook.sh')
 sha256sums=('SKIP'
+            'dfc112922e19ed1ea053132727a8431295365a2372666b44788a69b035459c15'
             'acdc5b45cc018cea04ee1aec56fd8fc3a2de62cf7bc41acf53b3790872120998'
             '326515cc7d00f93760beb844434ca7442caf7a9424614aa95a8f6d1ab79e15df'
             '4f8dff7716e73a8bba885638f12e3cdc9e87daec1896f75e700b981527e43870'