From c3dbb9d51f9a328f097bfc4bc46293fa402085a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 21 Jul 2021 17:04:17 -0300 Subject: [PATCH 1/3] New package: linux-base-2021.07.21 Base package to be used as dependency for linux and linux-lts. This way they can share the same code and users who want to stick with a given kernel version can just install that one and linux-base instead of needing the linux or linux-lts meta and ignorepkg dances. --- srcpkgs/linux-base/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/linux-base/template diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template new file mode 100644 index 000000000000..249f21fa27f2 --- /dev/null +++ b/srcpkgs/linux-base/template @@ -0,0 +1,18 @@ +# Template file for 'linux-base' +pkgname=linux-base +version=2021.07.21 +revision=1 +build_style=meta +short_desc="Linux kernel base dependencies" +maintainer="Érico Nogueira " +license="Public Domain" +homepage="https://voidlinux.org/" + +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) + depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut" + ;; + ppc*|armv7l*|aarch64*) + depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut" + ;; +esac From c7da6cd24431646223f284e8c6295569c5f44212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 21 Jul 2021 17:06:31 -0300 Subject: [PATCH 2/3] linux: move to using linux-base. --- srcpkgs/linux/template | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template index 33463643fc20..388a97185f3c 100644 --- a/srcpkgs/linux/template +++ b/srcpkgs/linux/template @@ -1,30 +1,15 @@ # Template file for 'linux' pkgname=linux version=5.12 -revision=1 +revision=2 build_style=meta +depends="linux${version} linux-base" short_desc="Linux kernel meta package" maintainer="Leah Neukirchen " license="Public Domain" homepage="http://www.voidlinux.org/" -case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) - depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut" - _depends_headers="linux${version}-headers" - ;; - ppc*|armv7l*|aarch64*) - depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut" - _depends_headers="linux${version}-headers" - ;; - arm*) - depends="linux${version}" - _depends_headers="linux${version}-headers" - ;; - *) ;; -esac - linux-headers_package() { short_desc="Linux kernel headers meta package" - depends="${_depends_headers}" + depends="linux${version}-headers" } From 921786a5a285488347d1a6bdb5c7beb15effee8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 21 Jul 2021 17:06:46 -0300 Subject: [PATCH 3/3] linux-lts: update to 5.10. Also move to using linux-base and xlint. --- srcpkgs/linux-lts/template | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template index ce6aace3950b..cf200e66935f 100644 --- a/srcpkgs/linux-lts/template +++ b/srcpkgs/linux-lts/template @@ -1,25 +1,15 @@ # Template file for 'linux-lts' pkgname=linux-lts -version=4.14 -revision=2 +version=5.10 +revision=1 build_style=meta -homepage="http://www.voidlinux.org/" +depends="linux${version} linux-base" short_desc="Linux LTS (Long Term Support) kernel meta package" maintainer="Leah Neukirchen " -license="Public domain" - -case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) - depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut" - _depends_headers="linux${version}-headers" - ;; - arm*|aarch64*) - depends="linux${version}" - _depends_headers="linux${version}-headers" - ;; -esac +license="Public Domain" +homepage="http://www.voidlinux.org/" linux-lts-headers_package() { short_desc="Linux longterm support kernel headers meta package" - depends="${_depends_headers}" + depends="linux${version}-headers" }