From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] make linux-headers a virtual package
Date: Wed, 14 Jun 2023 09:36:58 +0200 [thread overview]
Message-ID: <20230614073658.WCBUfmOtEDE5RMu0t3QCf_OZT9gq_yJ-8CdO3iM34Lw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43519@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2023-06-14 7:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 23:58 [PR PATCH] " classabbyamp
2023-06-14 7:36 ` classabbyamp [this message]
2023-07-18 13:13 ` leahneukirchen
2023-07-19 22:54 ` [PR PATCH] [Updated] " classabbyamp
2023-07-20 4:12 ` classabbyamp
2023-10-17 8:37 ` [PR PATCH] [Updated] " classabbyamp
2023-11-29 5:06 ` classabbyamp
2024-02-28 1:44 ` github-actions
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=20230614073658.WCBUfmOtEDE5RMu0t3QCf_OZT9gq_yJ-8CdO3iM34Lw@z \
--to=classabbyamp@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).