Re: [PR PATCH] [Updated] Kernels: remove host objects from scripts/

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/Piraty/void-packages kernel-cross-modules-fix
https://github.com/void-linux/void-packages/pull/15859

Kernels: remove host objects from scripts/
Shipping objects generated during cross-build makes no sense and breaks
"make scripts" on the targets on first dkms build

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kernel-cross-modules-fix-15859.patch --]
[-- Type: text/x-diff, Size: 3431 bytes --]

From c2d4bb9dbce3c0f7b48b2104406c7155b73488bf Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 25 Oct 2019 16:03:34 +0200
Subject: [PATCH 1/3] rpi-kernel-headers: remove objects from scripts/

Shipping objects generated during crossbuild makes no sense and breaks
"make scripts" on the targets on first dkms build
---
 srcpkgs/rpi-kernel/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index e0d42435123..e3724438abc 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -10,7 +10,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
 version=4.19.80
-revision=1
+revision=2
 wrksrc="linux-${_githash}"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 homepage="http://www.kernel.org"
@@ -181,6 +181,8 @@ do_install() {
 	# they need to be copied to ${hdrdest} before this step
 	if [ "$CROSS_BUILD" ]; then
 		make ${makejobs} ARCH=${_arch} _mrproper_scripts
+		# remove host specific objects as well
+		rm scripts/**/*.o
 	fi
 
 	# Copy files necessary for later builds.

From d6e0b7e34c55196c3829792012876b8e3785cc87 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 25 Oct 2019 16:30:38 +0200
Subject: [PATCH 2/3] linux4.19-headers: remove objects from scripts/

Shipping objects generated during crossbuild makes no sense and breaks
"make scripts" on the targets on first dkms build
---
 srcpkgs/linux4.19/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index be0ee554735..16049067f15 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.80
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -182,6 +182,8 @@ do_install() {
 	# they need to be copied to ${hdrdest} before this step
 	if [ "$CROSS_BUILD" ]; then
 		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		rm scripts/**/*.o
 	fi
 
 	# Copy files necessary for later builds, like nvidia and vmware

From d500dd3bf675f24a52a86f01e64578a52f56a0e1 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 25 Oct 2019 16:30:38 +0200
Subject: [PATCH 3/3] linux5.3-headers: remove objects from scripts/

Shipping objects generated during crossbuild makes no sense and breaks
"make scripts" on the targets on first dkms build

[ci skip]
---
 srcpkgs/linux5.3/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.3/template b/srcpkgs/linux5.3/template
index 895134128df..c442649302b 100644
--- a/srcpkgs/linux5.3/template
+++ b/srcpkgs/linux5.3/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.3'
 pkgname=linux5.3
 version=5.3.7
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Foxlet <foxlet@furcode.co>"
@@ -182,6 +182,8 @@ do_install() {
 	# they need to be copied to ${hdrdest} before this step
 	if [ "$CROSS_BUILD" ]; then
 		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		rm scripts/**/*.o
 	fi
 
 	# Copy files necessary for later builds, like nvidia and vmware