Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] runit-void: Standardise/improve os-release
@ 2022-02-14  4:31 dragonmaus
  2022-02-14  4:32 ` the-maldridge
                   ` (38 more replies)
  0 siblings, 39 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:31 UTC (permalink / raw)
  To: ml

[-- 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

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
@ 2022-02-14  4:32 ` the-maldridge
  2022-02-14  4:33 ` dragonmaus
                   ` (37 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: the-maldridge @ 2022-02-14  4:32 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1038631270

Comment:
Last I checked all of the ansible magic works on lsb_release, which is unaffected by this change.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
  2022-02-14  4:32 ` the-maldridge
@ 2022-02-14  4:33 ` dragonmaus
  2022-02-14  4:34 ` [PR REVIEW] " Vaelatern
                   ` (36 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:33 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1038631848

Comment:
> Last I checked all of the ansible magic works on lsb_release, which is unaffected by this change.

Ah, that's good. I just wanted to make sure, since you raised that as an issue on the other PR.

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
  2022-02-14  4:32 ` the-maldridge
  2022-02-14  4:33 ` dragonmaus
@ 2022-02-14  4:34 ` Vaelatern
  2022-02-14  4:35 ` dragonmaus
                   ` (35 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Vaelatern @ 2022-02-14  4:34 UTC (permalink / raw)
  To: ml

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

New review comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805498425

Comment:
Is this the norm?

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (2 preceding siblings ...)
  2022-02-14  4:34 ` [PR REVIEW] " Vaelatern
@ 2022-02-14  4:35 ` dragonmaus
  2022-02-14  4:36 ` dragonmaus
                   ` (34 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:35 UTC (permalink / raw)
  To: ml

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

New review comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805498561

Comment:
It's not necessarily how I would have coded it, but I was trying to stay as close to the existing structure as possible.

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (3 preceding siblings ...)
  2022-02-14  4:35 ` dragonmaus
@ 2022-02-14  4:36 ` dragonmaus
  2022-02-14  4:36 ` Vaelatern
                   ` (33 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:36 UTC (permalink / raw)
  To: ml

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

New review comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805498707

Comment:
If you're referring to the "symlink to /usr/lib/" thing, then yes, that's explicitly part of the [spec](https://www.freedesktop.org/software/systemd/man/os-release.html).

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (4 preceding siblings ...)
  2022-02-14  4:36 ` dragonmaus
@ 2022-02-14  4:36 ` Vaelatern
  2022-02-14  4:36 ` dragonmaus
                   ` (32 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Vaelatern @ 2022-02-14  4:36 UTC (permalink / raw)
  To: ml

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

New review comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805498778

Comment:
I mean putting it under `usr/lib` instead of directly in `etc`

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (5 preceding siblings ...)
  2022-02-14  4:36 ` Vaelatern
@ 2022-02-14  4:36 ` dragonmaus
  2022-02-14  4:38 ` dragonmaus
                   ` (31 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:36 UTC (permalink / raw)
  To: ml

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

New review comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805498707

Comment:
If you're referring to the "symlink to /usr/lib/" thing, then yes, that's explicitly part of the [spec](https://www.freedesktop.org/software/systemd/man/os-release.html) (as a "should" item, no less).

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (6 preceding siblings ...)
  2022-02-14  4:36 ` dragonmaus
@ 2022-02-14  4:38 ` dragonmaus
  2022-02-14  4:42 ` dragonmaus
                   ` (30 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:38 UTC (permalink / raw)
  To: ml

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

New review comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805499313

Comment:
The relevant section:

> `/usr/lib/os-release` is the recommended place to store OS release information as part of vendor trees. `/etc/os-release` should be a relative symlink to `/usr/lib/os-release`, to provide compatibility with applications only looking at `/etc/`.

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

* Re: [PR REVIEW] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (7 preceding siblings ...)
  2022-02-14  4:38 ` dragonmaus
@ 2022-02-14  4:42 ` dragonmaus
  2022-02-14  4:47 ` the-maldridge
                   ` (29 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-14  4:42 UTC (permalink / raw)
  To: ml

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

New review comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#discussion_r805498561

Comment:
It's not necessarily how I would have coded it, but I was trying to stay as close to the existing structure as possible.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (8 preceding siblings ...)
  2022-02-14  4:42 ` dragonmaus
@ 2022-02-14  4:47 ` the-maldridge
  2022-02-14  5:24 ` 0x5c
                   ` (28 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: the-maldridge @ 2022-02-14  4:47 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1038638246

Comment:
> > Last I checked all of the ansible magic works on lsb_release, which is unaffected by this change.
> 
> Ah, that's good. I just wanted to make sure, since you raised that as an issue on the other PR.

Indeed.  In the ~3 years since the original change was proposed the way that ansible detects OS name and version has changed, and a lot of the things that that detection was used for are no longer relevant.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (9 preceding siblings ...)
  2022-02-14  4:47 ` the-maldridge
@ 2022-02-14  5:24 ` 0x5c
  2022-02-14  9:41 ` 0x5c
                   ` (27 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-02-14  5:24 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1038658367

Comment:
I was planning to make a PR too, happy to see someone else was looking at improving the situation!

I was primarly exploring what would be required to use the `LOGO` key, and it turns out to be somewhat simple. All it needs is the name of an icon to be looked up in an icon theme. Here's a test with a random icon I hapened to have on my system, shown in kde's system information page 
![image](https://user-images.githubusercontent.com/5877043/153802154-30105e35-22ba-4ab0-af10-5ca3e4520cce.png)

All we'd need is to have the void logo added as an icon in the hicolor theme. I suggest having the icon be part of `void-artwork`; there it would just be placed in the appropriate directorie(s) of the `hicolor` theme, with no dependency required on the actual hicolor package. The artwork would have no effect without the actual hicolor theme (which provides the theme config, and would be an indirect dependency of anything that needs to show icons), and a situation where `void-artwork` were to be absent (like it being in `ignorepkg`) would simply have the application attempting to show an icon fallback to a default or no icon, as per the icon theme spec.


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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (10 preceding siblings ...)
  2022-02-14  5:24 ` 0x5c
@ 2022-02-14  9:41 ` 0x5c
  2022-02-14 16:26 ` Vaelatern
                   ` (26 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-02-14  9:41 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1038867159

Comment:
> I did leave the DISTRIB_ID variable intact, despite it not being part of the specification. Hopefully this will prevent any compatibility issues.

This is apparently for compatibility with steam and such, according to the commit message from when that key was added 8423da805c4d61d855dca6167aba11044003c290

Not sure how to properly test it. A quick search online suggests that it should fail to start altogether, but commenting out that line does not stop steam from staring on my machine, but it's still unclear how and if it needs it.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (11 preceding siblings ...)
  2022-02-14  9:41 ` 0x5c
@ 2022-02-14 16:26 ` Vaelatern
  2022-02-23 10:20 ` JamiKettunen
                   ` (25 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Vaelatern @ 2022-02-14 16:26 UTC (permalink / raw)
  To: ml

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1039288891

Comment:
Lots of salt uses `lsb_release`, though there is something in `salt-cloud` that uses `os-release` for bootstrap.

I'm going to check for the rest of salt compatibility.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (12 preceding siblings ...)
  2022-02-14 16:26 ` Vaelatern
@ 2022-02-23 10:20 ` JamiKettunen
  2022-02-23 18:08 ` 0x5c
                   ` (24 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: JamiKettunen @ 2022-02-23 10:20 UTC (permalink / raw)
  To: ml

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

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1048632578

Comment:
Regarding the `LOGO` key, we can just put an image in `/usr/share/icons` (note: not in `hicolor` subdir but maybe this is a GNOME issue?), for example this works ok with `LOGO=void-logo` in `/etc/os-release`:
```
sudo ln -s /usr/share/void-artwork/void-transparent.png /usr/share/icons/void-logo.png
```
![image](https://user-images.githubusercontent.com/47358222/155299230-8c7266f3-387d-4fb4-9657-5878c75c9720.png)
Could be worth seeing what else the [os-release freedesktop spec](https://www.freedesktop.org/software/systemd/man/os-release.html) lets us do if we want to update the file anyway here :)

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (13 preceding siblings ...)
  2022-02-23 10:20 ` JamiKettunen
@ 2022-02-23 18:08 ` 0x5c
  2022-02-23 18:25 ` 0x5c
                   ` (23 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-02-23 18:08 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049065386

Comment:
> Regarding the LOGO key, we can just put an image in /usr/share/icons (note: not in hicolor subdir but maybe this is a GNOME issue?), for example this works ok with LOGO=void-logo in /etc/os-release:

While this seems to work, it will break what follows the spec properly, as it states that icons should be placed in themes, hicolor being the default which is required to be available for applications to add their icons to. Icon lookup requires looking at the current theme then at hicolor if an icon has not been found.

This also breaks the ability to have scaled variations of an icon, and a scalable svg variant. Cuttlefish here is not even able to get a single size out of the icon
![image](https://user-images.githubusercontent.com/5877043/155375970-12fc3e3e-b8cb-4f1d-8e53-fd2bd220fe20.png)

As for the inability to add the icon to hicolor, it is because the way void defines that theme only allows icons to be placed in `hicolor/[scale]/[category]/`, but this is fine since we should be providing at least a couple of scales.

If the idea of adding the void logo is welcome, I'd do the work for it.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (14 preceding siblings ...)
  2022-02-23 18:08 ` 0x5c
@ 2022-02-23 18:25 ` 0x5c
  2022-02-23 18:33 ` 0x5c
                   ` (22 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-02-23 18:25 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049080584

Comment:
As far as using the spec as much as possible, the only remaining potentially applicable key is ANSI_COLOR, which is a suggested terminal formatting string for the distro (the name I imagine). 
This can be anything including foreground/background combos, and goes between the `\e[` and `m`.

I would suggest for it foreground only as the darker green from the logo `38;2;71;128;97`
![image](https://user-images.githubusercontent.com/5877043/155383091-784bcd4b-6b61-4ad8-aaac-099b8fe65509.png)

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (15 preceding siblings ...)
  2022-02-23 18:25 ` 0x5c
@ 2022-02-23 18:33 ` 0x5c
  2022-02-23 20:47 ` dragonmaus
                   ` (21 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-02-23 18:33 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049065386

Comment:
> Regarding the LOGO key, we can just put an image in /usr/share/icons (note: not in hicolor subdir but maybe this is a GNOME issue?), for example this works ok with LOGO=void-logo in /etc/os-release:

While this seems to work, it will break what follows the spec properly, as it states that icons should be placed in themes, hicolor being the default which is required to be available for applications to add their icons to. Icon lookup requires looking at the current theme then at hicolor if an icon has not been found.

~~This also breaks the ability to have scaled variations of an icon, and a scalable svg variant. Cuttlefish here is not even able to get a single size out of the icon
![image](https://user-images.githubusercontent.com/5877043/155375970-12fc3e3e-b8cb-4f1d-8e53-fd2bd220fe20.png)~~
Turns out that this was an older (and failed) attempt at the icon. Removing it from the picture, it becomes apparent that not a single place recognises the "themeless icon" as an icon.

As for the inability to add the icon to hicolor, it is because the way void defines that theme only allows icons to be placed in `hicolor/[scale]/[category]/`, but this is fine since we should be providing at least a couple of scales + scalable. Scalable-only would work if placed in the correct directory, but not everything accepts svg icons.

If the idea of adding the void logo is welcome, I'd do the work for it.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (16 preceding siblings ...)
  2022-02-23 18:33 ` 0x5c
@ 2022-02-23 20:47 ` dragonmaus
  2022-02-23 21:02 ` [PR PATCH] [Updated] " dragonmaus
                   ` (20 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-23 20:47 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049202226

Comment:
I'm all for further improving the os-release file! I left those parts out because A) I wanted to keep things as simple as possible to start with, and B) I have little experience in the realm of graphic design and related fields.

> note: not in `hicolor` subdir
Is there a specific reason you would want to avoid this? As far as I can tell, that is the only valid place to put "generic" icons.

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

* Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (17 preceding siblings ...)
  2022-02-23 20:47 ` dragonmaus
@ 2022-02-23 21:02 ` dragonmaus
  2022-02-23 21:02 ` dragonmaus
                   ` (19 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-23 21:02 UTC (permalink / raw)
  To: ml

[-- 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"

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (18 preceding siblings ...)
  2022-02-23 21:02 ` [PR PATCH] [Updated] " dragonmaus
@ 2022-02-23 21:02 ` dragonmaus
  2022-02-23 21:02 ` dragonmaus
                   ` (18 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-23 21:02 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049202226

Comment:
I'm all for further improving the os-release file! I left those parts out because A) I wanted to keep things as simple as possible to start with, and B) I have little experience in the realm of graphic design and related fields.

> note: not in `hicolor` subdir

Is there a specific reason you would want to avoid this? As far as I can tell, that is the only valid place to put "generic" icons.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (19 preceding siblings ...)
  2022-02-23 21:02 ` dragonmaus
@ 2022-02-23 21:02 ` dragonmaus
  2022-02-23 21:18 ` 0x5c
                   ` (17 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-23 21:02 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049202226

Comment:
I'm all for further improving the os-release file! I left those parts out because A) I wanted to keep things as simple as possible to start with, and B) I have little experience in the realm of graphic design and related fields.

- - -

> note: not in `hicolor` subdir

Is there a specific reason you would want to avoid this? As far as I can tell, that is the only valid place to put "generic" icons.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (20 preceding siblings ...)
  2022-02-23 21:02 ` dragonmaus
@ 2022-02-23 21:18 ` 0x5c
  2022-02-24  2:56 ` [PR PATCH] [Updated] " dragonmaus
                   ` (16 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-02-23 21:18 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1049225347

Comment:
> Is there a specific reason you would want to avoid this? As far as I can tell, that is the only valid place to put "generic" icons.

I think they tried putting the icon file directly at the root of hicolor, which would simply do nothing (with the way hicolor is setup on void)


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

* Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (21 preceding siblings ...)
  2022-02-23 21:18 ` 0x5c
@ 2022-02-24  2:56 ` dragonmaus
  2022-03-01 19:37 ` dragonmaus
                   ` (15 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-02-24  2:56 UTC (permalink / raw)
  To: ml

[-- 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"

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

* Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (22 preceding siblings ...)
  2022-02-24  2:56 ` [PR PATCH] [Updated] " dragonmaus
@ 2022-03-01 19:37 ` dragonmaus
  2022-03-01 19:45 ` dragonmaus
                   ` (14 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 19:37 UTC (permalink / raw)
  To: ml

[-- 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: 4220 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/3] 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/3] 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"

From a3ea788d7cebfd9969a4226846fd484af26f8a2c Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Tue, 1 Mar 2022 14:36:52 -0500
Subject: [PATCH 3/3] runit-void: Add LOGO to os-release file

---
 srcpkgs/runit-void/files/os-release | 1 +
 srcpkgs/runit-void/template         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 62de175a6fca..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -3,6 +3,7 @@ ID="void"
 PRETTY_NAME="Void Linux"
 HOME_URL="https://voidlinux.org/"
 DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
 ANSI_COLOR="0;38;2;71;128;97"
 
 DISTRIB_ID="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a0aef0484c0b..55837db206db 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -11,7 +11,7 @@ homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
 
-depends="virtual?awk procps-ng runit"
+depends="virtual?awk procps-ng runit void-artwork"
 conf_files="
  /etc/hostname
  /etc/locale.conf
@@ -38,6 +38,8 @@ post_install() {
 	vmkdir usr/lib
 	vinstall ${FILESDIR}/os-release 644 /usr/lib/
 	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
+	vmkdir usr/share/icons/hicolor/308x257
+	ln -s ../../../void-artwork/void-transparent.png ${DESTDIR}/usr/share/icons/hicolor/308x257/void-logo.png
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (23 preceding siblings ...)
  2022-03-01 19:37 ` dragonmaus
@ 2022-03-01 19:45 ` dragonmaus
  2022-03-01 19:46 ` dragonmaus
                   ` (13 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 19:45 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055795942

Comment:
I have added a preliminary iteration of LOGO. A couple of items I am uncertain about / would like clarification/approval on:

- Adding a dependency on `void-artwork`. This could be worked around by including the logo file directly in the `runit-void`, though that has its own downsides (e.g. duplicate files in two different packages, and two different installed locations).
- The "nonstandard" resolution of the image file (308 x 257). The [icon theme spec](https://specifications.freedesktop.org/icon-theme-spec/latest/index.html) is (as far as I can tell) somewhat unclear on this point, but it *seems* to imply that only square resolutions are accepted, and those only in powers of two. The solution for this would be to expand the image's canvas slightly to make it square, then downsize it to 256 x 256; I've done this, but will not commit it unless it's actually necessary. (This solution would by necessity also resolve the first point.)

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (24 preceding siblings ...)
  2022-03-01 19:45 ` dragonmaus
@ 2022-03-01 19:46 ` dragonmaus
  2022-03-01 19:51 ` classabbyamp
                   ` (12 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 19:46 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055795942

Comment:
I have added a preliminary iteration of LOGO. A couple of items I am uncertain about / would like clarification/approval on:

- Adding a dependency on `void-artwork`. This could be worked around by including the logo file directly in the `runit-void`, though that has its own downsides (e.g. duplicate files in two different packages, and two different installed locations).
- The "nonstandard" resolution of the image file (308 x 257). The [icon theme spec](https://specifications.freedesktop.org/icon-theme-spec/latest/index.html) is (as far as I can tell) somewhat unclear on this point, but it *seems* to imply that only square resolutions are accepted, and those only in powers of two. The solution for this would be to expand the image's canvas slightly to make it square, then downsize it to 256 x 256; I've done this, but will not commit it unless it's actually necessary. (This solution would also inherently resolve the first point.)

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (25 preceding siblings ...)
  2022-03-01 19:46 ` dragonmaus
@ 2022-03-01 19:51 ` classabbyamp
  2022-03-01 19:55 ` dragonmaus
                   ` (11 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2022-03-01 19:51 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055800178

Comment:
I had the idea of using the svg version of the logo (it's on one of the mirrors) and rsvg-convert to generate raster versions of it at various sizes at build time. this would remove the need for the void artwork dep I think. I can throw something together tonight if you're interested. 

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (26 preceding siblings ...)
  2022-03-01 19:51 ` classabbyamp
@ 2022-03-01 19:55 ` dragonmaus
  2022-03-01 20:57 ` [PR PATCH] [Updated] " dragonmaus
                   ` (10 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 19:55 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055803248

Comment:
That would be grand, and probably a lot closer to the "correct" way to do it.

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

* Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (27 preceding siblings ...)
  2022-03-01 19:55 ` dragonmaus
@ 2022-03-01 20:57 ` dragonmaus
  2022-03-01 21:13 ` 0x5c
                   ` (9 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 20:57 UTC (permalink / raw)
  To: ml

[-- 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: 4220 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/3] 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/3] 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"

From a3ea788d7cebfd9969a4226846fd484af26f8a2c Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Tue, 1 Mar 2022 14:36:52 -0500
Subject: [PATCH 3/3] runit-void: Add LOGO to os-release file

---
 srcpkgs/runit-void/files/os-release | 1 +
 srcpkgs/runit-void/template         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 62de175a6fca..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -3,6 +3,7 @@ ID="void"
 PRETTY_NAME="Void Linux"
 HOME_URL="https://voidlinux.org/"
 DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
 ANSI_COLOR="0;38;2;71;128;97"
 
 DISTRIB_ID="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a0aef0484c0b..55837db206db 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -11,7 +11,7 @@ homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
 
-depends="virtual?awk procps-ng runit"
+depends="virtual?awk procps-ng runit void-artwork"
 conf_files="
  /etc/hostname
  /etc/locale.conf
@@ -38,6 +38,8 @@ post_install() {
 	vmkdir usr/lib
 	vinstall ${FILESDIR}/os-release 644 /usr/lib/
 	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
+	vmkdir usr/share/icons/hicolor/308x257
+	ln -s ../../../void-artwork/void-transparent.png ${DESTDIR}/usr/share/icons/hicolor/308x257/void-logo.png
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (28 preceding siblings ...)
  2022-03-01 20:57 ` [PR PATCH] [Updated] " dragonmaus
@ 2022-03-01 21:13 ` 0x5c
  2022-03-01 21:15 ` classabbyamp
                   ` (8 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-03-01 21:13 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055863845

Comment:
> Adding a dependency on void-artwork. This could be worked around by including the logo file directly in the runit-void, though that has its own downsides (e.g. duplicate files in two different packages, and two different installed locations).

`runit-void` is a dependency of `base-minimal`, while `void-artwork` is only a dependency of `base-system`, so there should be no dependency from `runit-void` to `void-artwork`. This will not cause a problem on systems that don't have the artwork since the Icon Theme Spec is clear that applications looking for the icon should be ready for it to not exist, and either show a default icon or display no icon (as appropriate).

The actual icon could even be added to `void-artwork` in a separate PR without breakage.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (29 preceding siblings ...)
  2022-03-01 21:13 ` 0x5c
@ 2022-03-01 21:15 ` classabbyamp
  2022-03-01 21:15 ` dragonmaus
                   ` (7 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2022-03-01 21:15 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055864918

Comment:
> The actual icon could even be added to void-artwork in a separate PR without breakage.

If that's what's decided, I can do that.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (30 preceding siblings ...)
  2022-03-01 21:15 ` classabbyamp
@ 2022-03-01 21:15 ` dragonmaus
  2022-03-01 21:16 ` [PR PATCH] [Updated] " dragonmaus
                   ` (6 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 21:15 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055865123

Comment:
> The actual icon could even be added to `void-artwork` in a separate PR without breakage.

I like that idea. Reverting the commit now.

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

* Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (31 preceding siblings ...)
  2022-03-01 21:15 ` dragonmaus
@ 2022-03-01 21:16 ` dragonmaus
  2022-03-01 21:18 ` classabbyamp
                   ` (5 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 21:16 UTC (permalink / raw)
  To: ml

[-- 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: 6061 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/4] 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/4] 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"

From a3ea788d7cebfd9969a4226846fd484af26f8a2c Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Tue, 1 Mar 2022 14:36:52 -0500
Subject: [PATCH 3/4] runit-void: Add LOGO to os-release file

---
 srcpkgs/runit-void/files/os-release | 1 +
 srcpkgs/runit-void/template         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 62de175a6fca..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -3,6 +3,7 @@ ID="void"
 PRETTY_NAME="Void Linux"
 HOME_URL="https://voidlinux.org/"
 DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
 ANSI_COLOR="0;38;2;71;128;97"
 
 DISTRIB_ID="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a0aef0484c0b..55837db206db 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -11,7 +11,7 @@ homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
 
-depends="virtual?awk procps-ng runit"
+depends="virtual?awk procps-ng runit void-artwork"
 conf_files="
  /etc/hostname
  /etc/locale.conf
@@ -38,6 +38,8 @@ post_install() {
 	vmkdir usr/lib
 	vinstall ${FILESDIR}/os-release 644 /usr/lib/
 	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
+	vmkdir usr/share/icons/hicolor/308x257
+	ln -s ../../../void-artwork/void-transparent.png ${DESTDIR}/usr/share/icons/hicolor/308x257/void-logo.png
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

From 311c073b117728cf174eb111955a46fbc34c3b69 Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Tue, 1 Mar 2022 16:16:03 -0500
Subject: [PATCH 4/4] Revert "runit-void: Add LOGO to os-release file"

This reverts commit a3ea788d7cebfd9969a4226846fd484af26f8a2c.
---
 srcpkgs/runit-void/files/os-release | 1 -
 srcpkgs/runit-void/template         | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index e652642b5571..62de175a6fca 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -3,7 +3,6 @@ ID="void"
 PRETTY_NAME="Void Linux"
 HOME_URL="https://voidlinux.org/"
 DOCUMENTATION_URL="https://docs.voidlinux.org/"
-LOGO="void-logo"
 ANSI_COLOR="0;38;2;71;128;97"
 
 DISTRIB_ID="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 55837db206db..a0aef0484c0b 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -11,7 +11,7 @@ homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
 
-depends="virtual?awk procps-ng runit void-artwork"
+depends="virtual?awk procps-ng runit"
 conf_files="
  /etc/hostname
  /etc/locale.conf
@@ -38,8 +38,6 @@ post_install() {
 	vmkdir usr/lib
 	vinstall ${FILESDIR}/os-release 644 /usr/lib/
 	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
-	vmkdir usr/share/icons/hicolor/308x257
-	ln -s ../../../void-artwork/void-transparent.png ${DESTDIR}/usr/share/icons/hicolor/308x257/void-logo.png
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (32 preceding siblings ...)
  2022-03-01 21:16 ` [PR PATCH] [Updated] " dragonmaus
@ 2022-03-01 21:18 ` classabbyamp
  2022-03-01 21:18 ` classabbyamp
                   ` (4 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2022-03-01 21:18 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055867297

Comment:
I'd say adding the `LOGO=void-logo` is fine in this PR, it won't break anything and it avoids revbumping runit-void when the logos are added to void-artwork.

also as a sidenote, you'll want to squash the commits in this PR into one before it's mergable.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (33 preceding siblings ...)
  2022-03-01 21:18 ` classabbyamp
@ 2022-03-01 21:18 ` classabbyamp
  2022-03-01 21:20 ` dragonmaus
                   ` (3 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2022-03-01 21:18 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055867297

Comment:
I'd say adding the `LOGO=void-logo` is fine in this PR, it won't break anything and it avoids revbumping runit-void when the logos are added to void-artwork.

also as a sidenote, you'll want to squash the commits in this PR into a single one before it's mergable.

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (34 preceding siblings ...)
  2022-03-01 21:18 ` classabbyamp
@ 2022-03-01 21:20 ` dragonmaus
  2022-03-01 21:22 ` [PR PATCH] [Updated] " dragonmaus
                   ` (2 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 21:20 UTC (permalink / raw)
  To: ml

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

New comment by dragonmaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1055868912

Comment:
> I'd say adding the `LOGO=void-logo` is fine in this PR, it won't break anything and it avoids revbumping runit-void when the logos are added to void-artwork.

Noted.

> also as a sidenote, you'll want to squash the commits in this PR into a single one before it's mergable.

I was stressing a bit over how messy things were getting anyway, but that'll be easy to fix. :P

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

* Re: [PR PATCH] [Updated] runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (35 preceding siblings ...)
  2022-03-01 21:20 ` dragonmaus
@ 2022-03-01 21:22 ` dragonmaus
  2022-03-12 23:16 ` 0x5c
  2022-03-15 15:32 ` [PR PATCH] [Merged]: " leahneukirchen
  38 siblings, 0 replies; 40+ messages in thread
From: dragonmaus @ 2022-03-01 21:22 UTC (permalink / raw)
  To: ml

[-- 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: 1796 bytes --]

From 7524b7da6384d711b88642d6d7e4eea4fd7825cb 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 | 9 +++++++--
 srcpkgs/runit-void/template         | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e6..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,9 @@
-NAME="void"
+NAME="Void"
 ID="void"
+PRETTY_NAME="Void Linux"
+HOME_URL="https://voidlinux.org/"
+DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
+ANSI_COLOR="0;38;2;71;128;97"
+
 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

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

* Re: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (36 preceding siblings ...)
  2022-03-01 21:22 ` [PR PATCH] [Updated] " dragonmaus
@ 2022-03-12 23:16 ` 0x5c
  2022-03-15 15:32 ` [PR PATCH] [Merged]: " leahneukirchen
  38 siblings, 0 replies; 40+ messages in thread
From: 0x5c @ 2022-03-12 23:16 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/35604#issuecomment-1065982367

Comment:
I have been using this update along with https://github.com/void-linux/void-packages/pull/35942 for more than a week now with no problem at all.

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

* Re: [PR PATCH] [Merged]: runit-void: Standardise/improve os-release
  2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release dragonmaus
                   ` (37 preceding siblings ...)
  2022-03-12 23:16 ` 0x5c
@ 2022-03-15 15:32 ` leahneukirchen
  38 siblings, 0 replies; 40+ messages in thread
From: leahneukirchen @ 2022-03-15 15:32 UTC (permalink / raw)
  To: ml

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

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

runit-void: Standardise/improve os-release
https://github.com/void-linux/void-packages/pull/35604

Description:
#### 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.

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

end of thread, other threads:[~2022-03-15 15:32 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-14  4:31 [PR PATCH] runit-void: Standardise/improve os-release 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 ` [PR PATCH] [Updated] " dragonmaus
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

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