From: dragonmaus <dragonmaus@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
Date: Wed, 23 Feb 2022 22:02:19 +0100 [thread overview]
Message-ID: <20220223210219.6-NB9EbgQtIG3Qa5qFuMbEr9TtArlwDQsmLXiB1XKsQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35604@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
There is an updated pull request by dragonmaus against master on the void-packages repository
https://github.com/dragonmaus/void-packages os-release
https://github.com/void-linux/void-packages/pull/35604
runit-void: Standardise/improve os-release
#### Testing the changes
- I tested the changes in this PR: **YES**
- - -
This PR aims to bring the `os-release` file up to the same quality and standards as in other distributions.
There was a prior attempt to update `os-release` (#12160), but that included some fairly unusual departures; here I have made a point to change as little as possible while still providing useful and expected functionality.
I did leave the `DISTRIB_ID` variable intact, despite it not being part of the specification. Hopefully this will prevent any compatibility issues.
- - -
Special interest pings (for feedback):
@the-maldridge for Ansible compatibility.
@Vaelatern for Salt Stack compatibility.
A patch file from https://github.com/void-linux/void-packages/pull/35604.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-os-release-35604.patch --]
[-- Type: text/x-diff, Size: 2450 bytes --]
From f619ad04863dfb2a496db548f3782567fea9653e Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Sun, 13 Feb 2022 23:05:53 -0500
Subject: [PATCH 1/2] runit-void: Standardise/improve os-release
---
srcpkgs/runit-void/files/os-release | 7 +++++--
srcpkgs/runit-void/template | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e6..5680680f1b40 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,7 @@
-NAME="void"
+NAME="Void"
ID="void"
+PRETTY_NAME="Void Linux"
+HOME_URL="https://voidlinux.org/"
+DOCUMENTATION_URL="https://docs.voidlinux.org/"
+
DISTRIB_ID="void"
-PRETTY_NAME="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 0c98cadc9e18..a0aef0484c0b 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
# Template file for 'runit-void'
pkgname=runit-void
version=20210314
-revision=2
+revision=3
wrksrc="void-runit-${version}"
build_style=gnu-makefile
short_desc="Void Linux runit scripts"
@@ -32,10 +32,12 @@ post_install() {
vmkdir usr/bin
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
vconf ${FILESDIR}/hostname
- vconf ${FILESDIR}/os-release
vconf ${FILESDIR}/locale.conf
vinstall ${FILESDIR}/apparmor 644 /etc/default/
vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
+ vmkdir usr/lib
+ vinstall ${FILESDIR}/os-release 644 /usr/lib/
+ ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
# Enable services at post-install time instead.
rm -f ${DESTDIR}/etc/runit/runsvdir/current
rm -rf ${DESTDIR}/etc/runit/runsvdir/default
From f43706541f9637f7f9a90b1298ab4700467f8835 Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Wed, 23 Feb 2022 16:02:10 -0500
Subject: [PATCH 2/2] runit-void: Add ANSI_COLOR to os-release file
---
srcpkgs/runit-void/files/os-release | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 5680680f1b40..62de175a6fca 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -3,5 +3,6 @@ ID="void"
PRETTY_NAME="Void Linux"
HOME_URL="https://voidlinux.org/"
DOCUMENTATION_URL="https://docs.voidlinux.org/"
+ANSI_COLOR="0;38;2;71;128;97"
DISTRIB_ID="void"
next prev parent reply other threads:[~2022-02-23 21:02 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 4:31 [PR PATCH] " dragonmaus
2022-02-14 4:32 ` the-maldridge
2022-02-14 4:33 ` dragonmaus
2022-02-14 4:34 ` [PR REVIEW] " Vaelatern
2022-02-14 4:35 ` dragonmaus
2022-02-14 4:36 ` dragonmaus
2022-02-14 4:36 ` Vaelatern
2022-02-14 4:36 ` dragonmaus
2022-02-14 4:38 ` dragonmaus
2022-02-14 4:42 ` dragonmaus
2022-02-14 4:47 ` the-maldridge
2022-02-14 5:24 ` 0x5c
2022-02-14 9:41 ` 0x5c
2022-02-14 16:26 ` Vaelatern
2022-02-23 10:20 ` JamiKettunen
2022-02-23 18:08 ` 0x5c
2022-02-23 18:25 ` 0x5c
2022-02-23 18:33 ` 0x5c
2022-02-23 20:47 ` dragonmaus
2022-02-23 21:02 ` dragonmaus [this message]
2022-02-23 21:02 ` dragonmaus
2022-02-23 21:02 ` dragonmaus
2022-02-23 21:18 ` 0x5c
2022-02-24 2:56 ` [PR PATCH] [Updated] " dragonmaus
2022-03-01 19:37 ` dragonmaus
2022-03-01 19:45 ` dragonmaus
2022-03-01 19:46 ` dragonmaus
2022-03-01 19:51 ` classabbyamp
2022-03-01 19:55 ` dragonmaus
2022-03-01 20:57 ` [PR PATCH] [Updated] " dragonmaus
2022-03-01 21:13 ` 0x5c
2022-03-01 21:15 ` classabbyamp
2022-03-01 21:15 ` dragonmaus
2022-03-01 21:16 ` [PR PATCH] [Updated] " dragonmaus
2022-03-01 21:18 ` classabbyamp
2022-03-01 21:18 ` classabbyamp
2022-03-01 21:20 ` dragonmaus
2022-03-01 21:22 ` [PR PATCH] [Updated] " dragonmaus
2022-03-12 23:16 ` 0x5c
2022-03-15 15:32 ` [PR PATCH] [Merged]: " leahneukirchen
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=20220223210219.6-NB9EbgQtIG3Qa5qFuMbEr9TtArlwDQsmLXiB1XKsQ@z \
--to=dragonmaus@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).