From f619ad04863dfb2a496db548f3782567fea9653e Mon Sep 17 00:00:00 2001 From: David Wildasin 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 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 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