From 648a48aa58f27a4186b18bd2212acd2f79054fea Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 " @@ -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