[PR PATCH] runit-void: Standardise/improve os-release

[dragonmaus <dragonmaus@users.noreply.github.com>]

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

There is a new 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: 1744 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] 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