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