[PR PATCH] runit-void: move os-release to base-files

[PR PATCH] runit-void: move os-release to base-files

[ahesford]

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

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

https://github.com/ahesford/void-packages all_your_base
https://github.com/void-linux/void-packages/pull/42657

runit-void: move os-release to base-files
The `os-release` file really has nothing to do with runit and should be present even in the most basic installation, so it belongs in `base-files`. This also fixes some problems with meson calling Python's `platform` for host information in Void build containers (which don't install `runit-void`).

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From 648a48aa58f27a4186b18bd2212acd2f79054fea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Mar 2023 08:14:07 -0500
Subject: [PATCH] runit-void: move os-release to base-files

---
 srcpkgs/{runit-void => base-files}/files/os-release | 0
 srcpkgs/base-files/template                         | 8 ++++++--
 srcpkgs/runit-void/template                         | 4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename srcpkgs/{runit-void => base-files}/files/os-release (100%)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/base-files/files/os-release
similarity index 100%
rename from srcpkgs/runit-void/files/os-release
rename to srcpkgs/base-files/files/os-release
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index be6384f942c6..27b83604b648 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.142
-revision=14
+version=0.143
+revision=1
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -97,4 +97,8 @@ do_install() {
 	# udev rules
 	vmkdir usr/lib/udev/rules.d
 	install -m644 ${FILESDIR}/*.rules ${DESTDIR}/usr/lib/udev/rules.d
+
+	# os-release in the expected places
+	vinstall ${FILESDIR}/os-release 644 /usr/lib/
+	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
 }
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 71020dfba965..8f077e46efdc 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20220329
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -35,8 +35,6 @@ post_install() {
 	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

Re: runit-void: move os-release to base-files

[eli-schwartz]

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

New comment by eli-schwartz on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1460152595

Comment:
> This also fixes some problems with meson calling Python's `platform` for host information in Void build containers (which don't install `runit-void`).

The thing is that meson still doesn't read this file as far as I can tell, not even by the platform module, since the only function that attempts to read it is  `platform.freedesktop_os_release()`.

Not that it's a bad idea to move the os-release file, but I still don't understand how it's even possible to get a meson error here.

Re: runit-void: move os-release to base-files

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1460618618

Comment:
should `/etc/hostname` and `/etc/locale.conf` also be moved? those don't seem runit-related?

Re: runit-void: move os-release to base-files

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1460618618

Comment:
the meson issue was a false alarm, I misread something, but i still think this is a good idea.

should `/etc/hostname` and `/etc/locale.conf` also be moved? those don't seem runit-related?

Re: [PR PATCH] [Updated] runit-void: move os-release to base-files

[ahesford]

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

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

https://github.com/ahesford/void-packages all_your_base
https://github.com/void-linux/void-packages/pull/42657

runit-void: move os-release to base-files
The `os-release` file really has nothing to do with runit and should be present even in the most basic installation, so it belongs in `base-files`. This also fixes some problems with meson calling Python's `platform` for host information in Void build containers (which don't install `runit-void`).

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From 0500ff3c7803a0c6be686576a5bf2901f3c165af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Mar 2023 08:14:07 -0500
Subject: [PATCH] runit-void: move os-release, hostname and locale.conf to
 base-files

---
 .../{runit-void => base-files}/files/hostname    |  0
 .../{runit-void => base-files}/files/locale.conf |  0
 .../{runit-void => base-files}/files/os-release  |  0
 srcpkgs/base-files/template                      | 16 +++++++++++-----
 srcpkgs/runit-void/template                      |  8 +-------
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename srcpkgs/{runit-void => base-files}/files/hostname (100%)
 rename srcpkgs/{runit-void => base-files}/files/locale.conf (100%)
 rename srcpkgs/{runit-void => base-files}/files/os-release (100%)

diff --git a/srcpkgs/runit-void/files/hostname b/srcpkgs/base-files/files/hostname
similarity index 100%
rename from srcpkgs/runit-void/files/hostname
rename to srcpkgs/base-files/files/hostname
diff --git a/srcpkgs/runit-void/files/locale.conf b/srcpkgs/base-files/files/locale.conf
similarity index 100%
rename from srcpkgs/runit-void/files/locale.conf
rename to srcpkgs/base-files/files/locale.conf
diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/base-files/files/os-release
similarity index 100%
rename from srcpkgs/runit-void/files/os-release
rename to srcpkgs/base-files/files/os-release
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index be6384f942c6..cf896a773a0f 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.142
-revision=14
+version=0.143
+revision=1
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -9,6 +9,8 @@ maintainer="Enno Boland <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://www.voidlinux.org"
 conf_files="
+	/etc/hostname
+	/etc/locale.conf
 	/etc/inputrc
 	/etc/profile
 	/etc/hosts
@@ -60,9 +62,9 @@ do_install() {
 	done
 
 	vinstall ${FILESDIR}/securetty 600 etc
-	for f in profile hosts host.conf issue subuid subgid \
-		inputrc fstab passwd group crypttab nsswitch.conf; do
-		vinstall ${FILESDIR}/${f} 644 etc
+	for f in profile hostname hosts host.conf issue subuid subgid \
+		inputrc fstab passwd group crypttab nsswitch.conf locale.conf; do
+		vconf ${FILESDIR}/${f}
 	done
 	vmkdir etc/colors
 	vmkdir etc/profile.d
@@ -97,4 +99,8 @@ do_install() {
 	# udev rules
 	vmkdir usr/lib/udev/rules.d
 	install -m644 ${FILESDIR}/*.rules ${DESTDIR}/usr/lib/udev/rules.d
+
+	# os-release in the expected places
+	vinstall ${FILESDIR}/os-release 644 /usr/lib/
+	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
 }
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 71020dfba965..e7370da4da73 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20220329
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,8 +12,6 @@ checksum=43037b1cbf177a3ee6d690cc652eedf819ca37f44636311b55aa716e159a4718
 
 depends="virtual?awk procps-ng runit"
 conf_files="
- /etc/hostname
- /etc/locale.conf
  /etc/rc.conf
  /etc/rc.local
  /etc/rc.shutdown
@@ -30,13 +28,9 @@ make_dirs="
 post_install() {
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
-	vconf ${FILESDIR}/hostname
-	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

Re: runit-void: move os-release to base-files

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1462060068

Comment:
> should `/etc/hostname` and `/etc/locale.conf` also be moved? those don't seem runit-related?

That makes sense, so I made the change here.

Re: runit-void: move os-release to base-files

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1462103244

Comment:
hm, the fact that those are conf files may cause issues. @Duncaen thoughts? 

Re: runit-void: move os-release to base-files

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1462190849

Comment:
Forcing a reinstallation to test the move caused my hostname file ti he inadvertently replaced, so there does seem to be risk here. If we can't avoid this, it may make sense to leave the conf files where they started. 

Re: [PR PATCH] [Updated] runit-void: move os-release to base-files

[ahesford]

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

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

https://github.com/ahesford/void-packages all_your_base
https://github.com/void-linux/void-packages/pull/42657

runit-void: move os-release to base-files
The `os-release` file really has nothing to do with runit and should be present even in the most basic installation, so it belongs in `base-files`. This also fixes some problems with meson calling Python's `platform` for host information in Void build containers (which don't install `runit-void`).

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From 648a48aa58f27a4186b18bd2212acd2f79054fea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Mar 2023 08:14:07 -0500
Subject: [PATCH] runit-void: move os-release to base-files

---
 srcpkgs/{runit-void => base-files}/files/os-release | 0
 srcpkgs/base-files/template                         | 8 ++++++--
 srcpkgs/runit-void/template                         | 4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename srcpkgs/{runit-void => base-files}/files/os-release (100%)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/base-files/files/os-release
similarity index 100%
rename from srcpkgs/runit-void/files/os-release
rename to srcpkgs/base-files/files/os-release
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index be6384f942c6..27b83604b648 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.142
-revision=14
+version=0.143
+revision=1
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -97,4 +97,8 @@ do_install() {
 	# udev rules
 	vmkdir usr/lib/udev/rules.d
 	install -m644 ${FILESDIR}/*.rules ${DESTDIR}/usr/lib/udev/rules.d
+
+	# os-release in the expected places
+	vinstall ${FILESDIR}/os-release 644 /usr/lib/
+	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
 }
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 71020dfba965..8f077e46efdc 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20220329
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -35,8 +35,6 @@ post_install() {
 	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

Re: runit-void: move os-release to base-files

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1462250322

Comment:
XBPS forgets about files marked as `conf_files` during the transition and will overwrite whatever is currently there. Abandoning the hostname and locale moves for now to avoid catastrophe.

Cf. https://github.com/void-linux/xbps/issues/342 https://github.com/void-linux/xbps/pull/426

Re: [PR PATCH] [Closed]: runit-void: move os-release to base-files

[ahesford]

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

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

runit-void: move os-release to base-files
https://github.com/void-linux/void-packages/pull/42657

Description:
The `os-release` file really has nothing to do with runit and should be present even in the most basic installation, so it belongs in `base-files`. This also fixes some problems with meson calling Python's `platform` for host information in Void build containers (which don't install `runit-void`).

#### Testing the changes
- I tested the changes in this PR: **briefly**

Re: runit-void: move os-release to base-files

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42657#issuecomment-1462830994

Comment:
76f949037acbb491ff72595a0d902d0c3d2641a5