* Re: [PR PATCH] [Updated] make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
@ 2023-06-14 7:36 ` classabbyamp
2023-07-18 13:13 ` leahneukirchen
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2023-06-14 7:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages headers-virtual
https://github.com/void-linux/void-packages/pull/43519
make linux-headers a virtual package
this will allow device-specific kernels to provide linux-headers for packages that need it (like dkms) without needing hacks like `ignorepkg=`
fixes #43517
- etc/defaults.virtual: create vpkg linux-headers
generic kernels:
- linux4.14: -headers subpkg provides linux-headers
- linux4.19: -headers subpkg provides linux-headers
- linux5.4: -headers subpkg provides linux-headers
- linux5.10: -headers subpkg provides linux-headers
- linux5.15: -headers subpkg provides linux-headers
- linux6.1: -headers subpkg provides linux-headers
- linux6.2: -headers subpkg provides linux-headers
I did not add `linux`, `linux-lts`, and `linux-mainline` headers subpkgs as providers because then you'd have two providers installed (the metapackage and the package it points to), which I think makes sense.
device kernels:
- beaglebone-kernel: -headers subpkg provides linux-headers
- ci20-kernel: -headers subpkg provides linux-headers
- odroid-u2-kernel: -headers subpkg provides linux-headers
- pinebookpro-kernel: -headers subpkg provides linux-headers
- pinephone-kernel: -headers subpkg provides linux-headers
- rpi-kernel: -headers subpkg provides linux-headers
- sun7i-kernel: -headers subpkg provides linux-headers
packages that require linux-headers:
- bcc: depend on linux-headers vpkg
- dkms: depend on linux-headers vpkg
- lksctp-tools: depend on linux-headers vpkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
packages build with the vpkg in the proper metadata spot, but I haven't tried this otherwise, and I have no clue if updating to this will work
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/43519.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-headers-virtual-43519.patch --]
[-- Type: text/x-diff, Size: 18869 bytes --]
From eb7cf9b9dd7f2ff47144b4996abac88995e4755d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:07:32 -0400
Subject: [PATCH 01/19] etc/defaults.virtual: create vpkg linux-headers
this will allow device-specific kernels to provide linux-headers for
packages that need it (like dkms) without needing hacks like `ignorepkg=`
---
etc/defaults.virtual | 1 +
1 file changed, 1 insertion(+)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index f399b12998405..bb9955c73db31 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -37,3 +37,4 @@ xserver-abi-video xorg-server
libGL libglvnd
libEGL libglvnd
libGLES libglvnd
+linux-headers linux-headers
From 60a31ae16a0ec65b9b00481eeb763da66cb50623 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:15 -0400
Subject: [PATCH 02/19] linux4.14: -headers subpkg provides linux-headers
---
srcpkgs/linux4.14/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 52c8d87a71477..e836b1645e800 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
# Template file for 'linux4.14'
pkgname=linux4.14
version=4.14.295
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
@@ -304,6 +304,7 @@ linux4.14-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 7d42341b10f3d9f695782d6503612ca68e87ec7f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:23 -0400
Subject: [PATCH 03/19] linux4.19: -headers subpkg provides linux-headers
---
srcpkgs/linux4.19/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 3128f4bd14800..ab0d7c99f6a85 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.284
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -318,6 +318,7 @@ linux4.19-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From e101b6b21fdd84f1f30ed7aaf0babfabe5650220 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:28 -0400
Subject: [PATCH 04/19] linux5.4: -headers subpkg provides linux-headers
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index a48fbde924c7a..4f70c6a0ca856 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.4'
pkgname=linux5.4
version=5.4.245
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -327,6 +327,7 @@ linux5.4-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 1f8fa6605ec999e3d69e2d6b7898cfd602ea4af9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:32 -0400
Subject: [PATCH 05/19] linux5.10: -headers subpkg provides linux-headers
---
srcpkgs/linux5.10/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 97c063d99aa21..a5e2c56306be7 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.10'
pkgname=linux5.10
version=5.10.181
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -326,6 +326,7 @@ linux5.10-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 494291da7b2d059f836c73b5e090bfb78b4dc108 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:35 -0400
Subject: [PATCH 06/19] linux5.15: -headers subpkg provides linux-headers
---
srcpkgs/linux5.15/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 04706c462e21a..5e96b07f9afb3 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.15'
pkgname=linux5.15
version=5.15.114
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -305,6 +305,7 @@ linux5.15-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 9e3977afa9dfef6144f20ca0b61ff43649d381b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:39 -0400
Subject: [PATCH 07/19] linux6.1: -headers subpkg provides linux-headers
---
srcpkgs/linux6.1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 632c671f13b77..857777b437854 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.1'
pkgname=linux6.1
version=6.1.31
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
@@ -315,6 +315,7 @@ linux6.1-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From ab4b531f1cb3b9196aeb0c344f8ff4685517d28a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:45 -0400
Subject: [PATCH 08/19] linux6.2: -headers subpkg provides linux-headers
---
srcpkgs/linux6.2/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 970ce644770e6..da75153991760 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.2'
pkgname=linux6.2
version=6.2.15
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.2-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From b8ba2cb188510a5ecf591d2a0bd91d3609178498 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 14 Jun 2023 03:36:18 -0400
Subject: [PATCH 09/19] linux6.3: -headers subpkg provides linux-headers
---
srcpkgs/linux6.3/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 135f88fab13fa..eebe8b0d2596b 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.3'
pkgname=linux6.3
version=6.3.6
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.3-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 2f5782c574f2ff44fcc66cf35bcccfcbd6e01293 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:51 -0400
Subject: [PATCH 10/19] beaglebone-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/beaglebone-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index b36c9b36eb536..63c7882d22e2f 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -4,7 +4,7 @@ _bonever=bone68
pkgname=beaglebone-kernel
version=3.8.13
-revision=1
+revision=2
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2"
@@ -166,6 +166,7 @@ do_install() {
beaglebone-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
+ provides="linux-headers-${version}_1"
short_desc="Linux kernel headers for the BeagleBone (${version%.*} series)"
pkg_install() {
vmove usr/src
From acc9b8b884e00cef7fe8d193a713ed2cc5557c9a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:55 -0400
Subject: [PATCH 11/19] ci20-kernel: -headers subpkg provides linux-headers
---
srcpkgs/ci20-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 47fa9d1d57f05..da85f0ff6a32d 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -5,7 +5,7 @@ _gitshort="${_githash:0:7}"
pkgname=ci20-kernel
version=3.18.3
-revision=1
+revision=2
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2"
@@ -153,6 +153,7 @@ ci20-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc="The Linux kernel headers for CI20 Creator (${version%.*} series [git ${_gitshort}])"
pkg_install() {
vmove usr/src
From 2a641faf706c7b002cd8492ad3970fb554782e42 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:00 -0400
Subject: [PATCH 12/19] odroid-u2-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/odroid-u2-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index a9dc3c48b651c..9d76f3235384b 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -6,7 +6,7 @@ _gitshort="${_githash:0:7}"
pkgname=odroid-u2-kernel
version=3.8.13.28
-revision=4
+revision=5
maintainer="Enno Boland <gottox@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2"
@@ -155,6 +155,7 @@ do_install() {
odroid-u2-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
+ provides="linux-headers-${version}_1"
short_desc="Linux kernel headers for the Odroid U2/U3 (${version%.*} series [${_gitshort}])"
pkg_install() {
vmove usr/src
From 6a6ad0141bf5d247025823d18698491e951e0f3c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:03 -0400
Subject: [PATCH 13/19] pinebookpro-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/pinebookpro-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 929d5b4d81bda..2f00b1be13c13 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinebookpro-kernel'
pkgname=pinebookpro-kernel
version=6.1.9
-revision=1
+revision=2
archs="aarch64*"
short_desc="Linux kernel for Pinebook Pro"
maintainer="Cameron Nemo <cam@nohom.org>"
@@ -227,6 +227,7 @@ pinebookpro-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From d32d5e038064162e4be6e932dbe9ac12bf1bde93 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:07 -0400
Subject: [PATCH 14/19] pinephone-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/pinephone-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index fd7028805e286..7f8054412def6 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinephone-kernel'
pkgname=pinephone-kernel
version=6.1.7
-revision=1
+revision=2
_tag=orange-pi-6.1-20230118-1327
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John Sullivan <jsullivan@csumb.edu>"
@@ -248,6 +248,7 @@ pinephone-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 30c3f062c4d4386973f37e8c2c34824109190fb7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:10 -0400
Subject: [PATCH 15/19] rpi-kernel: -headers subpkg provides linux-headers
---
srcpkgs/rpi-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510a..0d710f2d5a670 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -14,7 +14,7 @@
pkgname=rpi-kernel
version=5.15.72
-revision=1
+revision=2
_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
archs="armv6l* armv7l* aarch64*"
hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
@@ -219,6 +219,7 @@ rpi-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc="${short_desc/kernel/kernel headers}"
pkg_install() {
vmove usr/src
From 4ab456f3df93feccb4de3e95a45443f75855121f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:13 -0400
Subject: [PATCH 16/19] sun7i-kernel: -headers subpkg provides linux-headers
---
srcpkgs/sun7i-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index d2809874a4754..710046f003f4a 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -6,7 +6,7 @@ _gitshort="${_githash:0:7}"
pkgname=sun7i-kernel
version=3.4.104
-revision=2
+revision=3
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
@@ -177,6 +177,7 @@ do_install() {
sun7i-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
+ provides="linux-headers-${version}_1"
short_desc="Linux kernel headers for sun7i (${version%.*} series [${_gitshort}])"
pkg_install() {
vmove usr/src
From c70e1e25aefb75ef11a85d650d70232da2d08162 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:43 -0400
Subject: [PATCH 17/19] bcc: depend on linux-headers vpkg
---
srcpkgs/bcc/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 1b690066612fc..424781ddd2932 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
# Template file for 'bcc'
pkgname=bcc
version=0.27.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
hostmakedepends="flex python3-setuptools"
@@ -25,11 +25,7 @@ post_extract() {
}
bcc-tools_package() {
short_desc+=" - tools"
- depends="python3-bcc>=${version}_${revision}"
- case "$XBPS_TARGET_MACHINE" in
- # only add linux-headers for archs it's currently built for
- i686*|x86_64*|ppc*|aarch64*) depends+=" linux-headers";;
- esac
+ depends="python3-bcc>=${version}_${revision} virtual?linux-headers"
pkg_install() {
vmove usr/share/bcc/man/man8
mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
From ab875a1778119b6d3fdb41e26c86ed58b96190b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:49 -0400
Subject: [PATCH 18/19] dkms: depend on linux-headers vpkg
---
srcpkgs/dkms/template | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 5da51b101a8cf..54cd1180012ca 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,9 +1,9 @@
# Template file for 'dkms'
pkgname=dkms
version=3.0.10
-revision=1
+revision=2
conf_files="/etc/dkms/framework.conf"
-depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1"
+depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1 virtual?linux-headers"
short_desc="Dynamic Kernel Module Support"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -14,12 +14,6 @@ checksum=1eba13bf3a2c140c21e9ba31c1db9e9b8eac55658291340b0e50b965565f9ef7
# https://github.com/void-linux/void-packages/issues/39066
make_dirs="/var/lib/dkms 0755 root root"
-case "$XBPS_TARGET_MACHINE" in
- # Too many competing kernels for arm* to depend on linux-headers
- arm*) ;;
- *) depends+=" linux-headers" ;;
-esac
-
if [ "$CROSS_BUILD" ]; then
depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
fi
From 8a9c37037ca89bd7b5d1745d1fbc586f16f93bff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:54 -0400
Subject: [PATCH 19/19] lksctp-tools: depend on linux-headers vpkg
---
srcpkgs/lksctp-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lksctp-tools/template b/srcpkgs/lksctp-tools/template
index 88bcae794b8df..887ba2c25f439 100644
--- a/srcpkgs/lksctp-tools/template
+++ b/srcpkgs/lksctp-tools/template
@@ -1,9 +1,9 @@
# Template file for 'lksctp-tools'
pkgname=lksctp-tools
version=1.0.19
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="automake libtool linux-headers"
+hostmakedepends="automake libtool virtual?linux-headers"
short_desc="User-space access to Linux Kernel SCTP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-only"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
2023-06-14 7:36 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-07-18 13:13 ` leahneukirchen
2023-07-19 22:54 ` [PR PATCH] [Updated] " classabbyamp
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-07-18 13:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/43519#issuecomment-1640206810
Comment:
That approach sgtm.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
2023-06-14 7:36 ` [PR PATCH] [Updated] " classabbyamp
2023-07-18 13:13 ` leahneukirchen
@ 2023-07-19 22:54 ` classabbyamp
2023-07-20 4:12 ` classabbyamp
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2023-07-19 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages headers-virtual
https://github.com/void-linux/void-packages/pull/43519
make linux-headers a virtual package
this will allow device-specific kernels to provide linux-headers for packages that need it (like dkms) without needing hacks like `ignorepkg=`
fixes #43517
- etc/defaults.virtual: create vpkg linux-headers
generic kernels:
- linux4.14: -headers subpkg provides linux-headers
- linux4.19: -headers subpkg provides linux-headers
- linux5.4: -headers subpkg provides linux-headers
- linux5.10: -headers subpkg provides linux-headers
- linux5.15: -headers subpkg provides linux-headers
- linux6.1: -headers subpkg provides linux-headers
- linux6.2: -headers subpkg provides linux-headers
I did not add `linux`, `linux-lts`, and `linux-mainline` headers subpkgs as providers because then you'd have two providers installed (the metapackage and the package it points to), which I think makes sense.
device kernels:
- beaglebone-kernel: -headers subpkg provides linux-headers
- ci20-kernel: -headers subpkg provides linux-headers
- odroid-u2-kernel: -headers subpkg provides linux-headers
- pinebookpro-kernel: -headers subpkg provides linux-headers
- pinephone-kernel: -headers subpkg provides linux-headers
- rpi-kernel: -headers subpkg provides linux-headers
- sun7i-kernel: -headers subpkg provides linux-headers
packages that require linux-headers:
- bcc: depend on linux-headers vpkg
- dkms: depend on linux-headers vpkg
- lksctp-tools: depend on linux-headers vpkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
packages build with the vpkg in the proper metadata spot, but I haven't tried this otherwise, and I have no clue if updating to this will work
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/43519.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-headers-virtual-43519.patch --]
[-- Type: text/x-diff, Size: 18787 bytes --]
From c43e7864fa080f606387ed93ab877ad993faa0bd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:07:32 -0400
Subject: [PATCH 01/19] etc/defaults.virtual: create vpkg linux-headers
this will allow device-specific kernels to provide linux-headers for
packages that need it (like dkms) without needing hacks like `ignorepkg=`
---
etc/defaults.virtual | 1 +
1 file changed, 1 insertion(+)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index f399b1299840..bb9955c73db3 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -37,3 +37,4 @@ xserver-abi-video xorg-server
libGL libglvnd
libEGL libglvnd
libGLES libglvnd
+linux-headers linux-headers
From 6029e0ce8c0b3670becaebb3febab961b30f3f5f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:15 -0400
Subject: [PATCH 02/19] linux4.14: -headers subpkg provides linux-headers
---
srcpkgs/linux4.14/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 52c8d87a7147..e836b1645e80 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
# Template file for 'linux4.14'
pkgname=linux4.14
version=4.14.295
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
@@ -304,6 +304,7 @@ linux4.14-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 4059939d2de886045e1e7ce6412399ee21f64db7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:23 -0400
Subject: [PATCH 03/19] linux4.19: -headers subpkg provides linux-headers
---
srcpkgs/linux4.19/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a035c030bdbe..4282530914b5 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.288
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -318,6 +318,7 @@ linux4.19-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 4ca393cf6cb022cf079d59a6e714c2bcbcc2054a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:28 -0400
Subject: [PATCH 04/19] linux5.4: -headers subpkg provides linux-headers
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 10456b6b5b9d..f76a35c54cbe 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.4'
pkgname=linux5.4
version=5.4.249
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -327,6 +327,7 @@ linux5.4-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From e156802952093c32577b3fd1a0e8b36caabe9645 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:32 -0400
Subject: [PATCH 05/19] linux5.10: -headers subpkg provides linux-headers
---
srcpkgs/linux5.10/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 4d75acd2a144..6871d2b7afe1 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.10'
pkgname=linux5.10
version=5.10.185
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -326,6 +326,7 @@ linux5.10-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 3440418da1e85ef536fddff07c28a5ea5aeeb032 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:35 -0400
Subject: [PATCH 06/19] linux5.15: -headers subpkg provides linux-headers
---
srcpkgs/linux5.15/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 1b5607b3c208..d786a7007822 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.15'
pkgname=linux5.15
version=5.15.120
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -305,6 +305,7 @@ linux5.15-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From cc89bffe8394337d5434747444c425ce70263dde Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:39 -0400
Subject: [PATCH 07/19] linux6.1: -headers subpkg provides linux-headers
---
srcpkgs/linux6.1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 89fb25d2af69..58349466899c 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.1'
pkgname=linux6.1
version=6.1.38
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
@@ -315,6 +315,7 @@ linux6.1-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 19ea5e23b2e43d7699b290599c01e81daaba1b52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:45 -0400
Subject: [PATCH 08/19] linux6.2: -headers subpkg provides linux-headers
---
srcpkgs/linux6.2/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 970ce644770e..da7515399176 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.2'
pkgname=linux6.2
version=6.2.15
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.2-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From cdf858381a35a1d2eb9871359acbfcae61949c7b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 14 Jun 2023 03:36:18 -0400
Subject: [PATCH 09/19] linux6.3: -headers subpkg provides linux-headers
---
srcpkgs/linux6.3/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index b75316bf1106..b3ba86f361b6 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.3'
pkgname=linux6.3
version=6.3.12
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.3-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From d0b0891973f820d2202e55f948e4cca27f25b18a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:51 -0400
Subject: [PATCH 10/19] beaglebone-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/beaglebone-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index b36c9b36eb53..63c7882d22e2 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -4,7 +4,7 @@ _bonever=bone68
pkgname=beaglebone-kernel
version=3.8.13
-revision=1
+revision=2
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2"
@@ -166,6 +166,7 @@ do_install() {
beaglebone-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
+ provides="linux-headers-${version}_1"
short_desc="Linux kernel headers for the BeagleBone (${version%.*} series)"
pkg_install() {
vmove usr/src
From 16351579e2692fa80a4862f1ff68981ce3f15d0e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:55 -0400
Subject: [PATCH 11/19] ci20-kernel: -headers subpkg provides linux-headers
---
srcpkgs/ci20-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 47fa9d1d57f0..da85f0ff6a32 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -5,7 +5,7 @@ _gitshort="${_githash:0:7}"
pkgname=ci20-kernel
version=3.18.3
-revision=1
+revision=2
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2"
@@ -153,6 +153,7 @@ ci20-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc="The Linux kernel headers for CI20 Creator (${version%.*} series [git ${_gitshort}])"
pkg_install() {
vmove usr/src
From 1fc97ca1af5b6d82584751e40bd0bd4eafc29d5f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:00 -0400
Subject: [PATCH 12/19] odroid-u2-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/odroid-u2-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index a9dc3c48b651..9d76f3235384 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -6,7 +6,7 @@ _gitshort="${_githash:0:7}"
pkgname=odroid-u2-kernel
version=3.8.13.28
-revision=4
+revision=5
maintainer="Enno Boland <gottox@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2"
@@ -155,6 +155,7 @@ do_install() {
odroid-u2-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
+ provides="linux-headers-${version}_1"
short_desc="Linux kernel headers for the Odroid U2/U3 (${version%.*} series [${_gitshort}])"
pkg_install() {
vmove usr/src
From dba14628f783ac2b48cc26d29b2cdd1aa1a7783f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:03 -0400
Subject: [PATCH 13/19] pinebookpro-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/pinebookpro-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 929d5b4d81bd..2f00b1be13c1 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinebookpro-kernel'
pkgname=pinebookpro-kernel
version=6.1.9
-revision=1
+revision=2
archs="aarch64*"
short_desc="Linux kernel for Pinebook Pro"
maintainer="Cameron Nemo <cam@nohom.org>"
@@ -227,6 +227,7 @@ pinebookpro-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From afcd8a932a6ef109eb1d1e0603b943420f4dce50 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:07 -0400
Subject: [PATCH 14/19] pinephone-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/pinephone-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index fd7028805e28..7f8054412def 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinephone-kernel'
pkgname=pinephone-kernel
version=6.1.7
-revision=1
+revision=2
_tag=orange-pi-6.1-20230118-1327
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John Sullivan <jsullivan@csumb.edu>"
@@ -248,6 +248,7 @@ pinephone-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 9bb85eb129fa6d8f27b40ef1f7b26a9a6e894e46 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:10 -0400
Subject: [PATCH 15/19] rpi-kernel: -headers subpkg provides linux-headers
---
srcpkgs/rpi-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..0d710f2d5a67 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -14,7 +14,7 @@
pkgname=rpi-kernel
version=5.15.72
-revision=1
+revision=2
_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
archs="armv6l* armv7l* aarch64*"
hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
@@ -219,6 +219,7 @@ rpi-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc="${short_desc/kernel/kernel headers}"
pkg_install() {
vmove usr/src
From c0be609e6b4551c9b7ceca98ee4a444dfc235a14 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:13 -0400
Subject: [PATCH 16/19] sun7i-kernel: -headers subpkg provides linux-headers
---
srcpkgs/sun7i-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index d2809874a475..710046f003f4 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -6,7 +6,7 @@ _gitshort="${_githash:0:7}"
pkgname=sun7i-kernel
version=3.4.104
-revision=2
+revision=3
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
@@ -177,6 +177,7 @@ do_install() {
sun7i-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
+ provides="linux-headers-${version}_1"
short_desc="Linux kernel headers for sun7i (${version%.*} series [${_gitshort}])"
pkg_install() {
vmove usr/src
From ac58de23f8d506d052ddd1dadd30ca77ab9af956 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:43 -0400
Subject: [PATCH 17/19] bcc: depend on linux-headers vpkg
---
srcpkgs/bcc/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index ecedbd8e4bef..5c4f26ccbc3d 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
# Template file for 'bcc'
pkgname=bcc
version=0.28.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
hostmakedepends="flex python3-setuptools"
@@ -25,11 +25,7 @@ post_extract() {
}
bcc-tools_package() {
short_desc+=" - tools"
- depends="python3-bcc>=${version}_${revision}"
- case "$XBPS_TARGET_MACHINE" in
- # only add linux-headers for archs it's currently built for
- i686*|x86_64*|ppc*|aarch64*) depends+=" linux-headers";;
- esac
+ depends="python3-bcc>=${version}_${revision} virtual?linux-headers"
pkg_install() {
vmove usr/share/bcc/man/man8
mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
From 4191f7cf39e5b31df00002b11f32f099a9c49aff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:49 -0400
Subject: [PATCH 18/19] dkms: depend on linux-headers vpkg
---
srcpkgs/dkms/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 34ee6c4afabb..54cd1180012c 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -3,7 +3,7 @@ pkgname=dkms
version=3.0.10
revision=2
conf_files="/etc/dkms/framework.conf"
-depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1"
+depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1 virtual?linux-headers"
short_desc="Dynamic Kernel Module Support"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -14,12 +14,6 @@ checksum=1eba13bf3a2c140c21e9ba31c1db9e9b8eac55658291340b0e50b965565f9ef7
# https://github.com/void-linux/void-packages/issues/39066
make_dirs="/var/lib/dkms 0755 root root"
-case "$XBPS_TARGET_MACHINE" in
- # Too many competing kernels for arm* to depend on linux-headers
- arm*) ;;
- *) depends+=" linux-headers" ;;
-esac
-
if [ "$CROSS_BUILD" ]; then
depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
fi
From d753fb6d226663127ae93e8e411c51e03dc2fb54 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:54 -0400
Subject: [PATCH 19/19] lksctp-tools: depend on linux-headers vpkg
---
srcpkgs/lksctp-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lksctp-tools/template b/srcpkgs/lksctp-tools/template
index 88bcae794b8d..887ba2c25f43 100644
--- a/srcpkgs/lksctp-tools/template
+++ b/srcpkgs/lksctp-tools/template
@@ -1,9 +1,9 @@
# Template file for 'lksctp-tools'
pkgname=lksctp-tools
version=1.0.19
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="automake libtool linux-headers"
+hostmakedepends="automake libtool virtual?linux-headers"
short_desc="User-space access to Linux Kernel SCTP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-only"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
` (2 preceding siblings ...)
2023-07-19 22:54 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-07-20 4:12 ` classabbyamp
2023-10-17 8:37 ` [PR PATCH] [Updated] " classabbyamp
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2023-07-20 4:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/43519#issuecomment-1643107592
Comment:
hm just tested this and it tried to install `linux-headers` when I installed `dkms`. does `virtual?linux-headers` resolve to `linux-headers` in the dependency solver? can a virtual and real package exist with the same name?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
` (3 preceding siblings ...)
2023-07-20 4:12 ` classabbyamp
@ 2023-10-17 8:37 ` classabbyamp
2023-11-29 5:06 ` classabbyamp
2024-02-28 1:44 ` github-actions
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2023-10-17 8:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages headers-virtual
https://github.com/void-linux/void-packages/pull/43519
make linux-headers a virtual package
this will allow device-specific kernels to provide linux-headers for packages that need it (like dkms) without needing hacks like `ignorepkg=`
fixes #43517
- etc/defaults.virtual: create vpkg linux-headers
generic kernels:
- linux4.14: -headers subpkg provides linux-headers
- linux4.19: -headers subpkg provides linux-headers
- linux5.4: -headers subpkg provides linux-headers
- linux5.10: -headers subpkg provides linux-headers
- linux5.15: -headers subpkg provides linux-headers
- linux6.1: -headers subpkg provides linux-headers
- linux6.2: -headers subpkg provides linux-headers
I did not add `linux`, `linux-lts`, and `linux-mainline` headers subpkgs as providers because then you'd have two providers installed (the metapackage and the package it points to), which I think makes sense.
device kernels:
- beaglebone-kernel: -headers subpkg provides linux-headers
- ci20-kernel: -headers subpkg provides linux-headers
- odroid-u2-kernel: -headers subpkg provides linux-headers
- pinebookpro-kernel: -headers subpkg provides linux-headers
- pinephone-kernel: -headers subpkg provides linux-headers
- rpi-kernel: -headers subpkg provides linux-headers
- sun7i-kernel: -headers subpkg provides linux-headers
packages that require linux-headers:
- bcc: depend on linux-headers vpkg
- dkms: depend on linux-headers vpkg
- lksctp-tools: depend on linux-headers vpkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
packages build with the vpkg in the proper metadata spot, but I haven't tried this otherwise, and I have no clue if updating to this will work
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/43519.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-headers-virtual-43519.patch --]
[-- Type: text/x-diff, Size: 14942 bytes --]
From c4dec6f60fb058922d7e08b655080e8460d0e227 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:07:32 -0400
Subject: [PATCH 01/16] etc/defaults.virtual: create vpkg linux-headers
this will allow device-specific kernels to provide linux-headers for
packages that need it (like dkms) without needing hacks like `ignorepkg=`
---
etc/defaults.virtual | 1 +
1 file changed, 1 insertion(+)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 9af8895a8492ca..812eb55b27992d 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -38,3 +38,4 @@ xserver-abi-video xorg-server
libGL libglvnd
libEGL libglvnd
libGLES libglvnd
+linux-headers linux-headers
From 40a2b594ac43c7f941e7f948074a3e7f8f4ec22a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:15 -0400
Subject: [PATCH 02/16] linux4.14: -headers subpkg provides linux-headers
---
srcpkgs/linux4.14/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7d74947b0b9561..c0e260e9cde6fb 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -304,6 +304,7 @@ linux4.14-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From b0f0d0d5a62c25dce5820c2d58a13ce1243397b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:23 -0400
Subject: [PATCH 03/16] linux4.19: -headers subpkg provides linux-headers
---
srcpkgs/linux4.19/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1cac0fd3b66ae2..652bb75e0c43b1 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.296
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -318,6 +318,7 @@ linux4.19-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 5f92ad5ed8fe2db7f03a4cc11c993d257440908a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:28 -0400
Subject: [PATCH 04/16] linux5.4: -headers subpkg provides linux-headers
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 4b5ecd5ffd3c78..3feb70826c9bf5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.4'
pkgname=linux5.4
version=5.4.258
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -327,6 +327,7 @@ linux5.4-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 29bc9a515c575ad7f1c1ba1072e62fc70e6937ea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:32 -0400
Subject: [PATCH 05/16] linux5.10: -headers subpkg provides linux-headers
---
srcpkgs/linux5.10/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 5bd87e647718f7..e6b7739b48a7f6 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.10'
pkgname=linux5.10
version=5.10.194
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -326,6 +326,7 @@ linux5.10-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 59ee1b70f84b837b98beece811a147601f135def Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:35 -0400
Subject: [PATCH 06/16] linux5.15: -headers subpkg provides linux-headers
---
srcpkgs/linux5.15/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 5a42d6b387924c..b4282055acfeef 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.15'
pkgname=linux5.15
version=5.15.131
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -305,6 +305,7 @@ linux5.15-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From f6b05be69457b933657dcde35f74d21dd695fec7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:39 -0400
Subject: [PATCH 07/16] linux6.1: -headers subpkg provides linux-headers
---
srcpkgs/linux6.1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 9dba170e3dcdbf..d56661f4cc8ed0 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -309,6 +309,7 @@ linux6.1-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From d0c60cf5bcd8e0acba478a1180ad350b7b141b73 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 14 Jun 2023 03:36:18 -0400
Subject: [PATCH 08/16] linux6.3: -headers subpkg provides linux-headers
---
srcpkgs/linux6.3/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 3208d6bdada376..c788bb77067cfe 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -317,6 +317,7 @@ linux6.3-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 834ef175156ac122a2e10cfb1f8ad4ab7f428288 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Oct 2023 04:35:58 -0400
Subject: [PATCH 09/16] linux6.4: -headers subpkg provides linux-headers
---
srcpkgs/linux6.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.4/template b/srcpkgs/linux6.4/template
index df5e55590f9628..e02ec6eee969ac 100644
--- a/srcpkgs/linux6.4/template
+++ b/srcpkgs/linux6.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.4'
pkgname=linux6.4
version=6.4.16
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.4-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From b284d021e3201263dd5585be3fce1d71ca36c4b6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Oct 2023 04:36:00 -0400
Subject: [PATCH 10/16] linux6.5: -headers subpkg provides linux-headers
---
srcpkgs/linux6.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.5/template b/srcpkgs/linux6.5/template
index 2b022f281895e1..c87f9af36a51cc 100644
--- a/srcpkgs/linux6.5/template
+++ b/srcpkgs/linux6.5/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.5'
pkgname=linux6.5
version=6.5.7
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -318,6 +318,7 @@ linux6.5-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 5097c1386621b066ec4d01a156972d87f452d10f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:03 -0400
Subject: [PATCH 11/16] pinebookpro-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/pinebookpro-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 929d5b4d81bda0..2f00b1be13c13c 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinebookpro-kernel'
pkgname=pinebookpro-kernel
version=6.1.9
-revision=1
+revision=2
archs="aarch64*"
short_desc="Linux kernel for Pinebook Pro"
maintainer="Cameron Nemo <cam@nohom.org>"
@@ -227,6 +227,7 @@ pinebookpro-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 9f946058a8b687db20bd3e600593852e9a3b2c19 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:07 -0400
Subject: [PATCH 12/16] pinephone-kernel: -headers subpkg provides
linux-headers
---
srcpkgs/pinephone-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index fd7028805e286f..7f8054412def6e 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinephone-kernel'
pkgname=pinephone-kernel
version=6.1.7
-revision=1
+revision=2
_tag=orange-pi-6.1-20230118-1327
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John Sullivan <jsullivan@csumb.edu>"
@@ -248,6 +248,7 @@ pinephone-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 843a78fa654fd80166414b9f92f7941307116eb2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:10 -0400
Subject: [PATCH 13/16] rpi-kernel: -headers subpkg provides linux-headers
---
srcpkgs/rpi-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 2fa1bb54b683e4..21cb0a735449f9 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -13,7 +13,7 @@
# Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
pkgname=rpi-kernel
version=6.1.54
-revision=1
+revision=2
_githash=fad58933544bb2a7b7db92847c25c79a83171fa6
archs="armv6l* armv7l* aarch64*"
hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
@@ -263,6 +263,7 @@ rpi-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
noshlibprovides=yes
+ provides="linux-headers-${version}_1"
short_desc="${short_desc/kernel/kernel headers}"
pkg_install() {
vmove usr/src
From 49d8c47649892f5077ffeaff80a738ac1b113331 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:43 -0400
Subject: [PATCH 14/16] bcc: depend on linux-headers vpkg
---
srcpkgs/bcc/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index ec4037ee556b9c..694b83ce45646d 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -21,11 +21,7 @@ post_extract() {
}
bcc-tools_package() {
short_desc+=" - tools"
- depends="python3-bcc>=${version}_${revision}"
- case "$XBPS_TARGET_MACHINE" in
- # only add linux-headers for archs it's currently built for
- i686*|x86_64*|ppc*|aarch64*) depends+=" linux-headers";;
- esac
+ depends="python3-bcc>=${version}_${revision} virtual?linux-headers"
pkg_install() {
vmove usr/share/bcc/man/man8
mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
From a3496c8822a43239220a6de0bf7add9e473d3978 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:49 -0400
Subject: [PATCH 15/16] dkms: depend on linux-headers vpkg
---
srcpkgs/dkms/template | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 4c86485bc01027..51b3748c045b0f 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,9 +1,9 @@
# Template file for 'dkms'
pkgname=dkms
version=3.0.10
-revision=3
+revision=4
conf_files="/etc/dkms/framework.conf /etc/default/dkms"
-depends="bash kmod gcc bc make coreutils xbps-triggers>=0.123_1"
+depends="bash kmod gcc bc make coreutils xbps-triggers>=0.123_1 virtual?linux-headers"
short_desc="Dynamic Kernel Module Support"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -14,12 +14,6 @@ checksum=1eba13bf3a2c140c21e9ba31c1db9e9b8eac55658291340b0e50b965565f9ef7
# https://github.com/void-linux/void-packages/issues/39066
make_dirs="/var/lib/dkms 0755 root root"
-case "$XBPS_TARGET_MACHINE" in
- # Too many competing kernels for arm* to depend on linux-headers
- arm*) ;;
- *) depends+=" linux-headers" ;;
-esac
-
if [ "$CROSS_BUILD" ]; then
depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
fi
From 0ce704bb3af18ab7c1e2ecacf5ef45e2812de269 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:54 -0400
Subject: [PATCH 16/16] lksctp-tools: depend on linux-headers vpkg
---
srcpkgs/lksctp-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lksctp-tools/template b/srcpkgs/lksctp-tools/template
index 88bcae794b8df2..887ba2c25f4395 100644
--- a/srcpkgs/lksctp-tools/template
+++ b/srcpkgs/lksctp-tools/template
@@ -1,9 +1,9 @@
# Template file for 'lksctp-tools'
pkgname=lksctp-tools
version=1.0.19
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="automake libtool linux-headers"
+hostmakedepends="automake libtool virtual?linux-headers"
short_desc="User-space access to Linux Kernel SCTP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-only"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
` (4 preceding siblings ...)
2023-10-17 8:37 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-11-29 5:06 ` classabbyamp
2024-02-28 1:44 ` github-actions
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2023-11-29 5:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1936 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages headers-virtual
https://github.com/void-linux/void-packages/pull/43519
make linux-headers a virtual package
this will allow device-specific kernels to provide linux-headers for packages that need it (like dkms) without needing hacks like `ignorepkg=`
fixes #43517
- etc/defaults.virtual: create vpkg linux-headers
generic kernels:
- linux4.14: -headers subpkg provides linux-headers
- linux4.19: -headers subpkg provides linux-headers
- linux5.4: -headers subpkg provides linux-headers
- linux5.10: -headers subpkg provides linux-headers
- linux5.15: -headers subpkg provides linux-headers
- linux6.1: -headers subpkg provides linux-headers
- linux6.3: -headers subpkg provides linux-headers
- linux6.4: -headers subpkg provides linux-headers
- linux6.5: -headers subpkg provides linux-headers
I did not add `linux`, `linux-lts`, and `linux-mainline` headers subpkgs as providers because then you'd have two providers installed (the metapackage and the package it points to), which I think makes sense.
device kernels:
- pinebookpro-kernel: -headers subpkg provides linux-headers
- pinephone-kernel: -headers subpkg provides linux-headers
- rpi-kernel: -headers subpkg provides linux-headers
packages that require linux-headers:
- bcc: depend on linux-headers vpkg
- dkms: depend on linux-headers vpkg
- lksctp-tools: depend on linux-headers vpkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
packages build with the vpkg in the proper metadata spot, but I haven't tried this otherwise, and I have no clue if updating to this will work
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/43519.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-headers-virtual-43519.patch --]
[-- Type: text/x-diff, Size: 16117 bytes --]
From b80279d7a0f35b1060fbfb3b8a058773900feae4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:07:32 -0400
Subject: [PATCH 01/17] etc/defaults.virtual: create vpkg linux-kernel-headers
this will allow device-specific kernels to provide linux-kernel-headers for
packages that need it (like dkms) without needing hacks like `ignorepkg=`
---
etc/defaults.virtual | 1 +
1 file changed, 1 insertion(+)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 9af8895a8492c..7e3f2689c8c57 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -38,3 +38,4 @@ xserver-abi-video xorg-server
libGL libglvnd
libEGL libglvnd
libGLES libglvnd
+linux-kernel-headers linux-headers
From 88f7bcd609d13c09119e7cc6e4117a76bf677aca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:15 -0400
Subject: [PATCH 02/17] linux4.14: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/linux4.14/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7d74947b0b956..7f8049732e248 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -304,6 +304,7 @@ linux4.14-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 0006e0f7a96c4f6a2d7c0ff7d4403fdfee9d41de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:23 -0400
Subject: [PATCH 03/17] linux4.19: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/linux4.19/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 36b93c5ad825a..024af5633e158 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.299
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -318,6 +318,7 @@ linux4.19-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 7a0943959fc76990c13a241a8f9f4676f474c0da Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:28 -0400
Subject: [PATCH 04/17] linux5.4: -headers subpkg provides linux-kernel-headers
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 3d319bac92a3f..405b8f01502b7 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.4'
pkgname=linux5.4
version=5.4.261
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
@@ -327,6 +327,7 @@ linux5.4-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 4df6ed1f344968ee97aab58876efde2be09ea00c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:32 -0400
Subject: [PATCH 05/17] linux5.10: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/linux5.10/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index ec9dc4f8e36ff..931ccfdd80053 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.10'
pkgname=linux5.10
version=5.10.199
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -326,6 +326,7 @@ linux5.10-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From c9167eff9d03f0ac0654eb9f3c6ac731ab70b458 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:35 -0400
Subject: [PATCH 06/17] linux5.15: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/linux5.15/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index bdf430b4df5d4..93e5bf0b6c3fb 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.15'
pkgname=linux5.15
version=5.15.137
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
@@ -305,6 +305,7 @@ linux5.15-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From a41e4b2c3e169289e13b86a8ad945876499491f8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:51:39 -0400
Subject: [PATCH 07/17] linux6.1: -headers subpkg provides linux-kernel-headers
---
srcpkgs/linux6.1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 84f49ed54a01e..1ae62c90e4659 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -309,6 +309,7 @@ linux6.1-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From c435439fb3cecbbab01c958955f97eb112b4522a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 14 Jun 2023 03:36:18 -0400
Subject: [PATCH 08/17] linux6.3: -headers subpkg provides linux-kernel-headers
---
srcpkgs/linux6.3/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 3208d6bdada37..853630f9d750d 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -317,6 +317,7 @@ linux6.3-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 99ebf0514b61815c7914efe890c8af112f599e4b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Oct 2023 04:35:58 -0400
Subject: [PATCH 09/17] linux6.4: -headers subpkg provides linux-kernel-headers
---
srcpkgs/linux6.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.4/template b/srcpkgs/linux6.4/template
index df5e55590f962..4c964def7f02a 100644
--- a/srcpkgs/linux6.4/template
+++ b/srcpkgs/linux6.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.4'
pkgname=linux6.4
version=6.4.16
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.4-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 2d59205533edb32cae1085f0769e6a53574b6d5b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Oct 2023 04:36:00 -0400
Subject: [PATCH 10/17] linux6.5: -headers subpkg provides linux-kernel-headers
---
srcpkgs/linux6.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.5/template b/srcpkgs/linux6.5/template
index 825aa7e9411ec..1504e39083d5d 100644
--- a/srcpkgs/linux6.5/template
+++ b/srcpkgs/linux6.5/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.5'
pkgname=linux6.5
version=6.5.12
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -318,6 +318,7 @@ linux6.5-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From a84a6e9f8810f278fdb3f9ad4ef904ca06c280c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 29 Nov 2023 00:02:41 -0500
Subject: [PATCH 11/17] linux6.6: -headers subpkg provides linux-kernel-headers
---
srcpkgs/linux6.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux6.6/template b/srcpkgs/linux6.6/template
index 28313c41d9a32..59616a96fe0a3 100644
--- a/srcpkgs/linux6.6/template
+++ b/srcpkgs/linux6.6/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.6'
pkgname=linux6.6
version=6.6.2
-revision=1
+revision=2
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -324,6 +324,7 @@ linux6.6-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From d0b8ab3da11c0575a541f9da14ab811bb888df1b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:03 -0400
Subject: [PATCH 12/17] pinebookpro-kernel: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/pinebookpro-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 929d5b4d81bda..61f3554102958 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinebookpro-kernel'
pkgname=pinebookpro-kernel
version=6.1.9
-revision=1
+revision=2
archs="aarch64*"
short_desc="Linux kernel for Pinebook Pro"
maintainer="Cameron Nemo <cam@nohom.org>"
@@ -227,6 +227,7 @@ pinebookpro-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From a0511c07591c809e4e58b8eac83e85780a082407 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:07 -0400
Subject: [PATCH 13/17] pinephone-kernel: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/pinephone-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index fd7028805e286..b2db30f6ca9ee 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'pinephone-kernel'
pkgname=pinephone-kernel
version=6.1.7
-revision=1
+revision=2
_tag=orange-pi-6.1-20230118-1327
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John Sullivan <jsullivan@csumb.edu>"
@@ -248,6 +248,7 @@ pinephone-kernel-headers_package() {
preserve=yes
nostrip=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc+=" - source headers for 3rd party modules"
pkg_install() {
vmove usr/src
From 4e2defb4b01c72105d8188471d618ef290837a7c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:10 -0400
Subject: [PATCH 14/17] rpi-kernel: -headers subpkg provides
linux-kernel-headers
---
srcpkgs/rpi-kernel/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 2fa1bb54b683e..f37260226558f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -13,7 +13,7 @@
# Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
pkgname=rpi-kernel
version=6.1.54
-revision=1
+revision=2
_githash=fad58933544bb2a7b7db92847c25c79a83171fa6
archs="armv6l* armv7l* aarch64*"
hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
@@ -263,6 +263,7 @@ rpi-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
noshlibprovides=yes
+ provides="linux-kernel-headers-${version}_1"
short_desc="${short_desc/kernel/kernel headers}"
pkg_install() {
vmove usr/src
From e66cc09b3ba48a6d7da407fee61543b418a9b283 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:43 -0400
Subject: [PATCH 15/17] bcc: depend on linux-kernel-headers vpkg
---
srcpkgs/bcc/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index ec4037ee556b9..075f2a5a3ed16 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -21,11 +21,7 @@ post_extract() {
}
bcc-tools_package() {
short_desc+=" - tools"
- depends="python3-bcc>=${version}_${revision}"
- case "$XBPS_TARGET_MACHINE" in
- # only add linux-headers for archs it's currently built for
- i686*|x86_64*|ppc*|aarch64*) depends+=" linux-headers";;
- esac
+ depends="python3-bcc>=${version}_${revision} virtual?linux-kernel-headers"
pkg_install() {
vmove usr/share/bcc/man/man8
mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
From 3a22ff873c711f1d3eb45309f6b98c0c641e28a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:49 -0400
Subject: [PATCH 16/17] dkms: depend on linux-kernel-headers vpkg
---
srcpkgs/dkms/template | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 4c86485bc0102..41bcf44970519 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,9 +1,9 @@
# Template file for 'dkms'
pkgname=dkms
version=3.0.10
-revision=3
+revision=4
conf_files="/etc/dkms/framework.conf /etc/default/dkms"
-depends="bash kmod gcc bc make coreutils xbps-triggers>=0.123_1"
+depends="bash kmod gcc bc make coreutils xbps-triggers>=0.123_1 virtual?linux-kernel-headers"
short_desc="Dynamic Kernel Module Support"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -14,12 +14,6 @@ checksum=1eba13bf3a2c140c21e9ba31c1db9e9b8eac55658291340b0e50b965565f9ef7
# https://github.com/void-linux/void-packages/issues/39066
make_dirs="/var/lib/dkms 0755 root root"
-case "$XBPS_TARGET_MACHINE" in
- # Too many competing kernels for arm* to depend on linux-headers
- arm*) ;;
- *) depends+=" linux-headers" ;;
-esac
-
if [ "$CROSS_BUILD" ]; then
depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
fi
From c21a01e02bca601a693e008a46fb8223a1b97908 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Apr 2023 19:52:54 -0400
Subject: [PATCH 17/17] lksctp-tools: depend on linux-kernel-headers vpkg
---
srcpkgs/lksctp-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lksctp-tools/template b/srcpkgs/lksctp-tools/template
index 88bcae794b8df..f776da7292ffe 100644
--- a/srcpkgs/lksctp-tools/template
+++ b/srcpkgs/lksctp-tools/template
@@ -1,9 +1,9 @@
# Template file for 'lksctp-tools'
pkgname=lksctp-tools
version=1.0.19
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="automake libtool linux-headers"
+hostmakedepends="automake libtool virtual?linux-kernel-headers"
short_desc="User-space access to Linux Kernel SCTP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-only"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: make linux-headers a virtual package
2023-04-18 23:58 [PR PATCH] make linux-headers a virtual package classabbyamp
` (5 preceding siblings ...)
2023-11-29 5:06 ` classabbyamp
@ 2024-02-28 1:44 ` github-actions
6 siblings, 0 replies; 8+ messages in thread
From: github-actions @ 2024-02-28 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/43519#issuecomment-1968035953
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 8+ messages in thread