Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] runit-void: move os-release to base-files
@ 2023-03-08 13:16 ahesford
  2023-03-08 13:24 ` eli-schwartz
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: ahesford @ 2023-03-08 13:16 UTC (permalink / raw)
  To: ml

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-03-09 21:11 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 13:16 [PR PATCH] runit-void: move os-release to base-files ahesford
2023-03-08 13:24 ` eli-schwartz
2023-03-08 18:06 ` classabbyamp
2023-03-08 18:08 ` classabbyamp
2023-03-09 13:21 ` [PR PATCH] [Updated] " ahesford
2023-03-09 13:21 ` ahesford
2023-03-09 13:50 ` classabbyamp
2023-03-09 14:52 ` ahesford
2023-03-09 15:24 ` [PR PATCH] [Updated] " ahesford
2023-03-09 15:27 ` ahesford
2023-03-09 21:03 ` [PR PATCH] [Closed]: " ahesford
2023-03-09 21:11 ` ahesford

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