Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts
@ 2021-07-21 20:10 ericonr
  2021-07-21 20:11 ` ericonr
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: ericonr @ 2021-07-21 20:10 UTC (permalink / raw)
  To: ml

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

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages base
https://github.com/void-linux/void-packages/pull/32109

Rework linux and linux-lts meta packages, also update linux-lts
Our dances for installing a given kernel version but still having firmware and dracut are error prone and unnecessary. This PR aims to solve that.

If we want to split the `dracut` dependency for greater initramfs flexibility, we can discuss that here too.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-32109.patch --]
[-- Type: text/x-diff, Size: 4200 bytes --]

From c3dbb9d51f9a328f097bfc4bc46293fa402085a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <ericonr@disroot.org>"
+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?= <erico.erc@gmail.com>
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 <leah@vuxu.org>"
 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 faebe4e88a4780b8a3f9d7581fb4bd60a2dfe1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:46 -0300
Subject: [PATCH 3/3] linux-lts: update to 5.4.

Also move to using linux-base.
---
 srcpkgs/linux-lts/template | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..ba8403534b47 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.4
+revision=1
 build_style=meta
+depends="linux${version} linux-base"
 homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 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
-
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
@ 2021-07-21 20:11 ` ericonr
  2021-07-21 20:24 ` ahesford
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-21 20:11 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#issuecomment-884467198

Comment:
@void-linux/pkg-committers 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
  2021-07-21 20:11 ` ericonr
@ 2021-07-21 20:24 ` ahesford
  2021-07-21 20:33 ` ericonr
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ahesford @ 2021-07-21 20:24 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#issuecomment-884475269

Comment:
I like this. We could make an `initramfs` virtual in place of `dracut`, but I don't really know wheter it's better to make the initramfs kernel hooks for every generator aware of `/etc/default/initramfs-regenerate` or to make a centralized kernel hook that is aware of every possible initramfs generator.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
  2021-07-21 20:11 ` ericonr
  2021-07-21 20:24 ` ahesford
@ 2021-07-21 20:33 ` ericonr
  2021-07-21 20:37 ` ahesford
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-21 20:33 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#issuecomment-884480576

Comment:
I worry about the virtual option because of how XBPS chooses to install virtuals. For example, when booster is merged, it might be installed in dracut's place.

A common hook, otoh, sounds great to me. I much prefer it over duplicating logic across hooks for each generator.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (2 preceding siblings ...)
  2021-07-21 20:33 ` ericonr
@ 2021-07-21 20:37 ` ahesford
  2021-07-21 20:47 ` [PR REVIEW] " zdykstra
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ahesford @ 2021-07-21 20:37 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#issuecomment-884482827

Comment:
Yeah, I know a virtual is problematic, but we don't really have the machinery for alternate packages with a specific default.

Before, the issue with a central hook was where to put it. Putting the hook (post-install and post-remove) in your new `linux-base` makes perfect sense. We can keep the hard `dracut` dependency in `linux-base` for now, and people who want to use an alternative can install whatever they want, set `/etc/default/initramfs-regenerate` as appropriate, and `ignorepkg` if they really care about removing `dracut`.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (3 preceding siblings ...)
  2021-07-21 20:37 ` ahesford
@ 2021-07-21 20:47 ` zdykstra
  2021-07-21 21:01 ` ericonr
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: zdykstra @ 2021-07-21 20:47 UTC (permalink / raw)
  To: ml

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

New review comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#discussion_r674334550

Comment:
I would have thought linux5.10 would be the preferred new LTS, since it's expected to be maintained through 2026 while 5.4 will be maintained through 2024.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (4 preceding siblings ...)
  2021-07-21 20:47 ` [PR REVIEW] " zdykstra
@ 2021-07-21 21:01 ` ericonr
  2021-07-21 21:23 ` leahneukirchen
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-21 21:01 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#discussion_r674342753

Comment:
2025, according to https://www.kernel.org/category/releases.html

They are basically one year apart... I'm not sure which is best, tbh.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (5 preceding siblings ...)
  2021-07-21 21:01 ` ericonr
@ 2021-07-21 21:23 ` leahneukirchen
  2021-07-21 21:30 ` ericonr
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2021-07-21 21:23 UTC (permalink / raw)
  To: ml

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

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#discussion_r674355936

Comment:
I'm in favor of 5.10, which seems to run quite well.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (6 preceding siblings ...)
  2021-07-21 21:23 ` leahneukirchen
@ 2021-07-21 21:30 ` ericonr
  2021-07-21 21:30 ` ericonr
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-21 21:30 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#discussion_r674359313

Comment:
In that case, would a reasonable policy be to update `linux-lts` to the latest LTS, when it appears? So basically update the package once a year.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (7 preceding siblings ...)
  2021-07-21 21:30 ` ericonr
@ 2021-07-21 21:30 ` ericonr
  2021-07-22  1:49 ` [PR PATCH] [Updated] " ericonr
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-21 21:30 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#discussion_r674359465

Comment:
when it appears + some wait time, maybe? not sure

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (8 preceding siblings ...)
  2021-07-21 21:30 ` ericonr
@ 2021-07-22  1:49 ` ericonr
  2021-07-22  1:50 ` [PR REVIEW] " ericonr
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-22  1:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ericonr/void-packages base
https://github.com/void-linux/void-packages/pull/32109

Rework linux and linux-lts meta packages, also update linux-lts
Our dances for installing a given kernel version but still having firmware and dracut are error prone and unnecessary. This PR aims to solve that.

If we want to split the `dracut` dependency for greater initramfs flexibility, we can discuss that here too.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-32109.patch --]
[-- Type: text/x-diff, Size: 4202 bytes --]

From c3dbb9d51f9a328f097bfc4bc46293fa402085a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <ericonr@disroot.org>"
+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?= <erico.erc@gmail.com>
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 <leah@vuxu.org>"
 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 d3bdf6a124138aecb3319a259986fce22b4b6a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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.
---
 srcpkgs/linux-lts/template | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..82576bc0f1c1 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
+depends="linux${version} linux-base"
 homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 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
-
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (9 preceding siblings ...)
  2021-07-22  1:49 ` [PR PATCH] [Updated] " ericonr
@ 2021-07-22  1:50 ` ericonr
  2021-07-22  1:51 ` ericonr
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-22  1:50 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#discussion_r674450080

Comment:
I got 3 votes on 5.10, so I have moved to that.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (10 preceding siblings ...)
  2021-07-22  1:50 ` [PR REVIEW] " ericonr
@ 2021-07-22  1:51 ` ericonr
  2021-07-22  1:52 ` [PR PATCH] [Updated] " ericonr
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-22  1:51 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32109#issuecomment-884606010

Comment:
As mentioned on IRC, having the common hook in `linux-base` would be bad for users who don't have that package. A cleaner fix is including the hook directly in `xbps-triggers`.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (11 preceding siblings ...)
  2021-07-22  1:51 ` ericonr
@ 2021-07-22  1:52 ` ericonr
  2021-08-04 14:00 ` ericonr
  2021-08-04 14:02 ` [PR PATCH] [Merged]: " ericonr
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-22  1:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ericonr/void-packages base
https://github.com/void-linux/void-packages/pull/32109

Rework linux and linux-lts meta packages, also update linux-lts
Our dances for installing a given kernel version but still having firmware and dracut are error prone and unnecessary. This PR aims to solve that.

If we want to split the `dracut` dependency for greater initramfs flexibility, we can discuss that here too.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-32109.patch --]
[-- Type: text/x-diff, Size: 4279 bytes --]

From c3dbb9d51f9a328f097bfc4bc46293fa402085a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <ericonr@disroot.org>"
+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?= <erico.erc@gmail.com>
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 <leah@vuxu.org>"
 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?= <erico.erc@gmail.com>
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 <leah@vuxu.org>"
-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"
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (12 preceding siblings ...)
  2021-07-22  1:52 ` [PR PATCH] [Updated] " ericonr
@ 2021-08-04 14:00 ` ericonr
  2021-08-04 14:02 ` [PR PATCH] [Merged]: " ericonr
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-08-04 14:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ericonr/void-packages base
https://github.com/void-linux/void-packages/pull/32109

Rework linux and linux-lts meta packages, also update linux-lts
Our dances for installing a given kernel version but still having firmware and dracut are error prone and unnecessary. This PR aims to solve that.

If we want to split the `dracut` dependency for greater initramfs flexibility, we can discuss that here too.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-32109.patch --]
[-- Type: text/x-diff, Size: 4302 bytes --]

From 3afbf865dbb20677468255e47c065f8306f1352b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <ericonr@disroot.org>"
+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 048abcce32b7b27796f8329443e4e524573db1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:31 -0300
Subject: [PATCH 2/3] linux: update to 5.13.

Also 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..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 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 ea7ae12f60be89c1fd2d7c7d4796f59b035b52ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <leah@vuxu.org>"
-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"
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Merged]: Rework linux and linux-lts meta packages, also update linux-lts
  2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
                   ` (13 preceding siblings ...)
  2021-08-04 14:00 ` ericonr
@ 2021-08-04 14:02 ` ericonr
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-08-04 14:02 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

Rework linux and linux-lts meta packages, also update linux-lts
https://github.com/void-linux/void-packages/pull/32109

Description:
Our dances for installing a given kernel version but still having firmware and dracut are error prone and unnecessary. This PR aims to solve that.

If we want to split the `dracut` dependency for greater initramfs flexibility, we can discuss that here too.

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-08-04 14:02 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-21 20:10 [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts ericonr
2021-07-21 20:11 ` ericonr
2021-07-21 20:24 ` ahesford
2021-07-21 20:33 ` ericonr
2021-07-21 20:37 ` ahesford
2021-07-21 20:47 ` [PR REVIEW] " zdykstra
2021-07-21 21:01 ` ericonr
2021-07-21 21:23 ` leahneukirchen
2021-07-21 21:30 ` ericonr
2021-07-21 21:30 ` ericonr
2021-07-22  1:49 ` [PR PATCH] [Updated] " ericonr
2021-07-22  1:50 ` [PR REVIEW] " ericonr
2021-07-22  1:51 ` ericonr
2021-07-22  1:52 ` [PR PATCH] [Updated] " ericonr
2021-08-04 14:00 ` ericonr
2021-08-04 14:02 ` [PR PATCH] [Merged]: " ericonr

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).