Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] base-files+eudev: move kvm.rules from base-files to eudev
@ 2020-09-10 14:41 sgn
  2020-09-11  5:34 ` CameronNemo
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: sgn @ 2020-09-10 14:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 915 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages base-files-udev
https://github.com/void-linux/void-packages/pull/24805

base-files+eudev: move kvm.rules from base-files to eudev
Prior to 33d781ff19 (base-files: update to 0.120., 2015-03-22).
We don't requires the existence of `kvm` groups.

Since that change, we ship a udev rule with `base-files`, hence the need
of `kvm` groups.

It's more than 5 years from the change, kvm should be available
in all installation.

Simply removing "system_accounts=kvm:24" from base-files may cause
problem with those very old installation.

Let move those statements and the udev rules to eudev instead.
When moving the rules, rename it to allow partial upgrade,
otherwise, we'll run into conflicts.

A patch file from https://github.com/void-linux/void-packages/pull/24805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-files-udev-24805.patch --]
[-- Type: text/x-diff, Size: 3146 bytes --]

From 4e88a824dcf0e12befe627a56acf101f45ce0ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 21:09:37 +0700
Subject: [PATCH] base-files+eudev: move kvm.rules from base-files to eudev

Prior to 33d781ff19 (base-files: update to 0.120., 2015-03-22).
We don't requires the existence of `kvm` groups.

Since that change, we ship a udev rule with `base-files`, hence the need
of `kvm` groups.

It's more than 5 years from the change, kvm should be available
in all installation.

Simply removing "system_accounts=kvm:24" from base-files may cause
problem with those very old installation.

Let move those statements and the udev rules to eudev instead.
When moving the rules, rename it to allow partial upgrade,
otherwise, we'll run into conflicts.
---
 srcpkgs/base-files/template                               | 8 +-------
 .../files/66-kvm.rules => eudev/files/67-kvm.rules}       | 0
 srcpkgs/eudev/template                                    | 4 +++-
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename srcpkgs/{base-files/files/66-kvm.rules => eudev/files/67-kvm.rules} (100%)

diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index e4b0947cbaa..4cac23e01ee 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.141
-revision=4
+revision=5
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -28,8 +28,6 @@ conf_files="
 	/etc/nsswitch.conf"
 
 replaces="base-directories>=0"
-# New system groups
-system_groups="kvm:24"
 
 do_install() {
 	# Create bin and lib dirs and symlinks.
@@ -91,8 +89,4 @@ do_install() {
 
 	# Create /proc/self/mounts -> /etc/mtab symlink.
 	ln -sf /proc/self/mounts ${DESTDIR}/etc/mtab
-
-	# udev rules
-	vmkdir usr/lib/udev/rules.d
-	install -m644 ${FILESDIR}/*.rules ${DESTDIR}/usr/lib/udev/rules.d
 }
diff --git a/srcpkgs/base-files/files/66-kvm.rules b/srcpkgs/eudev/files/67-kvm.rules
similarity index 100%
rename from srcpkgs/base-files/files/66-kvm.rules
rename to srcpkgs/eudev/files/67-kvm.rules
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 42ef6369b06..56f57619895 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
 version=3.2.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
 hostmakedepends="automake libtool pkg-config gperf libxslt docbook-xsl"
@@ -16,6 +16,7 @@ homepage="https://github.com/gentoo/eudev"
 distfiles="https://github.com/gentoo/eudev/archive/v${version}.tar.gz"
 checksum=7d281276b480da3935d1acb239748c2c9db01a8043aad7e918ce57a223d8cd24
 conf_files="/etc/udev/udev.conf"
+system_groups="kvm:24"
 
 pre_configure() {
 	autoreconf -fi
@@ -23,6 +24,7 @@ pre_configure() {
 
 post_install() {
 	mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev"
+	vinstall ${FILESDIR}/67-kvm.rules 644 usr/lib/udev/rules.d
 	vsv udevd
 }
 

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-09-19  3:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 14:41 [PR PATCH] base-files+eudev: move kvm.rules from base-files to eudev sgn
2020-09-11  5:34 ` CameronNemo
2020-09-11 14:26 ` sgn
2020-09-15 19:12 ` ericonr
2020-09-15 21:37 ` CameronNemo
2020-09-19  3:42 ` [PR PATCH] [Closed]: " sgn

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).