runit-void: move os-release to base-files

This commit is contained in:
Andrew J. Hesford 2023-03-08 08:14:07 -05:00
parent e8f7c7f32d
commit 76f949037a
3 changed files with 7 additions and 5 deletions

View file

@ -1,7 +1,7 @@
# Template file for 'base-files' # Template file for 'base-files'
pkgname=base-files pkgname=base-files
version=0.142 version=0.143
revision=14 revision=1
bootstrap=yes bootstrap=yes
depends="xbps-triggers" depends="xbps-triggers"
short_desc="Void Linux base system files" short_desc="Void Linux base system files"
@ -97,4 +97,8 @@ do_install() {
# udev rules # udev rules
vmkdir usr/lib/udev/rules.d vmkdir usr/lib/udev/rules.d
install -m644 ${FILESDIR}/*.rules ${DESTDIR}/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
} }

View file

@ -1,7 +1,7 @@
# Template file for 'runit-void' # Template file for 'runit-void'
pkgname=runit-void pkgname=runit-void
version=20220329 version=20220329
revision=1 revision=2
build_style=gnu-makefile build_style=gnu-makefile
short_desc="Void Linux runit scripts" short_desc="Void Linux runit scripts"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
@ -35,8 +35,6 @@ post_install() {
vinstall ${FILESDIR}/apparmor 644 /etc/default/ vinstall ${FILESDIR}/apparmor 644 /etc/default/
vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/ vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
vmkdir usr/lib 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. # Enable services at post-install time instead.
rm -f ${DESTDIR}/etc/runit/runsvdir/current rm -f ${DESTDIR}/etc/runit/runsvdir/current
rm -rf ${DESTDIR}/etc/runit/runsvdir/default rm -rf ${DESTDIR}/etc/runit/runsvdir/default