Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions srcpkgs/base-files/template
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
}
4 changes: 1 addition & 3 deletions srcpkgs/runit-void/template
Original file line number Diff line number Diff line change
@@ -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>"
Expand Down Expand Up @@ -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
Expand Down