[PR PATCH] dkms: build modpost

[PR PATCH] dkms: build modpost

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages dkms-modpost-fix
https://github.com/void-linux/void-packages/pull/24846

dkms: build modpost
see https://github.com/void-linux/void-packages/pull/24449#issuecomment-683459462

A patch file from https://github.com/void-linux/void-packages/pull/24846.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dkms-modpost-fix-24846.patch --]
[-- Type: text/x-diff, Size: 3391 bytes --]

From 464557fde26010485ac63299da7be6dc19b5c445 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 12 Sep 2020 15:16:44 +0200
Subject: [PATCH 1/2] dkms: ensure modpost is built for kernels >=5.0

else modules like wireguard cannot build on crossbuilt kernels>=5.0 as
linux/60df1aee2aecb53efb4218b4dfdf7d6c80a5a3de modev modpost from
'scripts' to 'prepare0'.

The same has been applied to xbps-triggers/dkms
---
 srcpkgs/dkms/files/kernel.d/dkms.postinst | 4 ++--
 srcpkgs/dkms/template                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index ef2a10bac28..6b345bef905 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -19,8 +19,8 @@ fi
 
 export IGNORE_CC_MISMATCH=1
 
-if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then
-	yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build scripts
+if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] || [ ! -f /lib/modules/${VERSION}/build/scripts/mod/modpost ]; then
+	yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build prepare0
 fi
 
 # Check available DKMS modules
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 664f899abb9..ba61736f1b5 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.8.3
-revision=2
+revision=3
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils"
 short_desc="Dynamic Kernel Modules System"

From 411e16b1787565680f9152cd837b247bd0d40425 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 12 Sep 2020 15:16:49 +0200
Subject: [PATCH 2/2] xbps-triggers: ensure modpost is built

else modules like wireguard cannot build on crossbuilt kernels>=5.0 as
linux/60df1aee2aecb53efb4218b4dfdf7d6c80a5a3de moved modpost from
'scripts' to 'prepare0'.

The same has been applied to dkms/dkms.postinst
---
 srcpkgs/xbps-triggers/files/dkms | 6 +++---
 srcpkgs/xbps-triggers/template   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 2208af9e745..fcd64efd030 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -70,9 +70,9 @@ add_modules() {
 			echo "Skipping kernel-${_kver}. kernel-headers package not installed..."
 			continue
 		fi
-		if [ ! -f ${f}/build/scripts/basic/fixdep ] ; then
-			echo -n "Building scripts for kernel-${_kver}... "
-			yes "" | make -j$(nproc) -C ${f}/build scripts > ${f}/build/make.log 2>&1
+		if [ ! -f ${f}/build/scripts/basic/fixdep ] || [ ! -f ${f}/build/scripts/mod/modpost ] ; then
+			echo -n "Prepare to build modules for kernel-${_kver}... "
+			yes "" | make -j$(nproc) -C ${f}/build prepare0 > ${f}/build/make.log 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index f316b269a7d..41190ad2d61 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
 version=0.116
-revision=2
+revision=3
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"

Re: dkms: build modpost

[pbui]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/24846#issuecomment-691496701

Comment:
I get the following when I try to build the `prepare0` target on armv7l (glibc)

```
make: Entering directory '/usr/src/rpi-kernel-headers-5.4.59_1'
scripts/Makefile.build:42: arch/arm/tools/Makefile: No such file or directory
make[1]: *** No rule to make target 'arch/arm/tools/Makefile'.  Stop.
make: *** [arch/arm/Makefile:325: archheaders] Error 2
make: *** Waiting for unfinished jobs....
make: Leaving directory '/usr/src/rpi-kernel-headers-5.4.59_1'
```

Re: [PR PATCH] [Updated] dkms: build modpost

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages dkms-modpost-fix
https://github.com/void-linux/void-packages/pull/24846

dkms: build modpost
see https://github.com/void-linux/void-packages/pull/24449#issuecomment-683459462

Tested on:
* aarch64-musl, rpi-kernel-headers-5.4.59_1

A patch file from https://github.com/void-linux/void-packages/pull/24846.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dkms-modpost-fix-24846.patch --]
[-- Type: text/x-diff, Size: 3440 bytes --]

From 373c41cb05e328f4c62bb109f25e2de12681d67e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 12 Sep 2020 15:16:44 +0200
Subject: [PATCH 1/2] dkms: build 'prepare0' instead of 'scripts'

to ensure modpost is built on the host else modules don't build
on crossbuilt kernels >= 5.0 since
    linux/60df1aee2aecb53efb4218b4dfdf7d6c80a5a3de
moved modpost from target 'scripts' to 'prepare0'.

The same has been applied to xbps-triggers/dkms
---
 srcpkgs/dkms/files/kernel.d/dkms.postinst | 4 ++--
 srcpkgs/dkms/template                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index ef2a10bac28..6b345bef905 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -19,8 +19,8 @@ fi
 
 export IGNORE_CC_MISMATCH=1
 
-if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then
-	yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build scripts
+if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] || [ ! -f /lib/modules/${VERSION}/build/scripts/mod/modpost ]; then
+	yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build prepare0
 fi
 
 # Check available DKMS modules
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 664f899abb9..ba61736f1b5 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.8.3
-revision=2
+revision=3
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils"
 short_desc="Dynamic Kernel Modules System"

From 71ef9750c10b66d60564cda4f0ee9590a4054be9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 12 Sep 2020 15:16:49 +0200
Subject: [PATCH 2/2] xbps-triggers: (dkms) build 'prepare0' instead of
 'scripts'

to ensure modpost is built on the host else modules don't build on
crossbuilt kernels >= 5.0 sinc
    linux/60df1aee2aecb53efb4218b4dfdf7d6c80a5a3de
moved modpost from target 'scripts' to 'prepare0'.

The same has been applied to xbps-triggers/dkms
---
 srcpkgs/xbps-triggers/files/dkms | 6 +++---
 srcpkgs/xbps-triggers/template   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 2208af9e745..fcd64efd030 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -70,9 +70,9 @@ add_modules() {
 			echo "Skipping kernel-${_kver}. kernel-headers package not installed..."
 			continue
 		fi
-		if [ ! -f ${f}/build/scripts/basic/fixdep ] ; then
-			echo -n "Building scripts for kernel-${_kver}... "
-			yes "" | make -j$(nproc) -C ${f}/build scripts > ${f}/build/make.log 2>&1
+		if [ ! -f ${f}/build/scripts/basic/fixdep ] || [ ! -f ${f}/build/scripts/mod/modpost ] ; then
+			echo -n "Prepare to build modules for kernel-${_kver}... "
+			yes "" | make -j$(nproc) -C ${f}/build prepare0 > ${f}/build/make.log 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 4131b479bef..75010d6bee7 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.117
+version=0.118
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

Re: dkms: build modpost

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/24846#issuecomment-723180731

Comment:
@pbui the error you reported was fixed in 93d88be93970db3fd96af994d4c6306b2aa66317

Re: dkms: build modpost

[pbui]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/24846#issuecomment-723182576

Comment:
Yes, I believe this fixes building wireguard via dkms.

Re: [PR REVIEW] dkms: build modpost

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24846#discussion_r519215386

Comment:
How does this fail if someone doesn't have gcc installed?

Re: [PR REVIEW] dkms: build modpost

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/24846#discussion_r519430678

Comment:
I don't get what you mean, I'm afraid. dkms depends on gcc

Re: [PR REVIEW] dkms: build modpost

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24846#discussion_r519467299

Comment:
Oops, sorry. For some reason I was thinking this would be run when someone installed the headers package.

I haven't tested, though.

Re: [PR PATCH] [Merged]: dkms: build modpost

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

There's a merged pull request on the void-packages repository

dkms: build modpost
https://github.com/void-linux/void-packages/pull/24846

Description:
see https://github.com/void-linux/void-packages/pull/24449#issuecomment-683459462

Tested on:
* aarch64-musl, rpi-kernel-headers-5.4.59_1