From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] runit-void: move os-release to base-files
Date: Thu, 09 Mar 2023 14:21:08 +0100 [thread overview]
Message-ID: <20230309132108.wsCV4wK8KItm_kgbfbb7nul6FrVgASE60FHZs436yfk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42657@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2023-03-09 13:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 13:16 [PR PATCH] " 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 ` ahesford [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230309132108.wsCV4wK8KItm_kgbfbb7nul6FrVgASE60FHZs436yfk@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).