From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Rework linux and linux-lts meta packages, also update linux-lts
Date: Wed, 21 Jul 2021 22:10:58 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32109@inbox.vuxu.org> (raw)
[-- 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"
}
next reply other threads:[~2021-07-21 20:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 20:10 ericonr [this message]
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
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32109@inbox.vuxu.org \
--to=ericonr@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).