From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dkms: build modpost
Date: Fri, 06 Nov 2020 17:11:36 +0100 [thread overview]
Message-ID: <20201106161136.gUY8tZpOLkQN6HpokoVtTyUtr47482LOox7iYwr9ers@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24846@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2020-11-06 16:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-12 13:30 [PR PATCH] " Piraty
2020-09-12 14:20 ` pbui
2020-11-06 16:11 ` Piraty [this message]
2020-11-06 16:44 ` Piraty
2020-11-06 16:47 ` pbui
2020-11-07 20:30 ` [PR REVIEW] " ericonr
2020-11-08 15:14 ` Piraty
2020-11-08 19:33 ` ericonr
2020-11-08 22:46 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201106161136.gUY8tZpOLkQN6HpokoVtTyUtr47482LOox7iYwr9ers@z \
--to=piraty@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).