From ffd9e91a405c7137a97bfbb5f8e03d62f5826950 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:07:32 -0400 Subject: [PATCH 01/18] 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 083ab6349eac..a00923d8628b 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -36,3 +36,4 @@ xserver-abi-video xorg-server libGL libglvnd libEGL libglvnd libGLES libglvnd +linux-headers linux-headers From d8166695a47fbe33ce4c1e21cff1fdecdb43d37b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:15 -0400 Subject: [PATCH 02/18] 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 " 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 7ba3d428f2a566ca616695355426a0501173ec67 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:23 -0400 Subject: [PATCH 03/18] 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 041dad9dfd7c..8192dbd0f1b8 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.280 -revision=1 +revision=2 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Helmut Pozimski " 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 154da5f67c00d39380fb565140c9ca24fc26cecf Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:28 -0400 Subject: [PATCH 04/18] 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 c898477c451f..f6d19ec2077b 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.240 -revision=1 +revision=2 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Helmut Pozimski " 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 e95acb8cac1e4dedacc4f0a1d23222f9459d3ac0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:32 -0400 Subject: [PATCH 05/18] 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 528144f1091a..4a563fe327d5 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.174 -revision=1 +revision=2 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Leah Neukirchen " 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 6070dfcd2a7d8afdc0480f16be2f1addd4e6f44c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:35 -0400 Subject: [PATCH 06/18] 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 29f80c3893f6..a55cfafe929e 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.102 -revision=1 +revision=2 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Leah Neukirchen " 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 55b6e67f2ea0e69ecf853d7ce59076edfdd9c7e9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:39 -0400 Subject: [PATCH 07/18] 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 01e101e767da..69c66de6bd9b 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.21 -revision=1 +revision=2 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Đoàn Trần Công Danh " 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 1ec0b88005c5273e80b6c332e463a1d5d99a4106 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:45 -0400 Subject: [PATCH 08/18] 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 9bd2d5779d6f..1f96ca8286dc 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.11 -revision=1 +revision=2 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="John " 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 310f79741fe485399cbf7c8bad05527e91bdc028 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:51 -0400 Subject: [PATCH 09/18] 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 " 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 82bdef86d35d6a3609b98e6a9a99f71e1ed633be Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:51:55 -0400 Subject: [PATCH 10/18] 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 " 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 db53a967b59478ab39663a0a72371a0b223344ac Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:00 -0400 Subject: [PATCH 11/18] 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 " 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 1f29e51a434ad94700868a21b7a71e1470a011d6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:03 -0400 Subject: [PATCH 12/18] 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 " @@ -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 c7b5aad06e95f51a13f52a942dbe018d4d7ced5d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:07 -0400 Subject: [PATCH 13/18] 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 " @@ -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 7f52bb9df5807f3ccbc5555f6366d7345ad6be51 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:10 -0400 Subject: [PATCH 14/18] 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 7a6cc46fa00e553854f7ded8bcc196aa9910daca Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:13 -0400 Subject: [PATCH 15/18] 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 " 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 c47bfdad2b4a33df99281a1890a4f7fa877b6ab2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:43 -0400 Subject: [PATCH 16/18] 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 1b690066612f..424781ddd293 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 906401cc0d6f1fd63fe38129c51916a8fcea1332 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:49 -0400 Subject: [PATCH 17/18] 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 5da51b101a8c..54cd1180012c 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 " 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 5399b96b1a782b46b672daee82a89e47cedf38ce Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 18 Apr 2023 19:52:54 -0400 Subject: [PATCH 18/18] 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 " license="GPL-2.0-or-later, LGPL-2.1-only"