rpm/cdemu-daemon
SHA256
1
0
Fork 0
forked from pool/cdemu-daemon
Code Pull Requests Activity

Accepting request 1152112 from home:theMarix:branches:filesystems

Browse Source 
- Fix cdemu-daemon startup failing for regular users due to not
  being able to trigger the load of the vhba kernel module.
  (boo#958517)
- Changes in spec file are from spec_cleaner and unrelated to
  functional change.

OBS-URL: https://build.opensuse.org/request/show/1152112
OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=67
This commit is contained in:
David Sterba 2024-03-08 14:31:08 +00:00 committed by Git OBS Bridge
parent 503f5f44ba
commit db734045d3
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
60-vhba.rules
View File

@ -1,2 +1,2 @@
#KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="cdrom"
KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=vhba_ctl"

7
cdemu-daemon.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 27 09:48:05 UTC 2024 - Matthias Bach <marix@marix.org>
- Fix cdemu-daemon startup failing for regular users due to not
being able to trigger the load of the vhba kernel module.
(boo#958517)
-------------------------------------------------------------------
Sat Feb 5 12:47:15 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

19
cdemu-daemon.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cdemu-daemon
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,9 +18,8 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: cdemu-daemon
Version: 3.2.6
Release: 0
@ -28,7 +27,6 @@ Summary: Device daemon for cdemu, a virtual CD-ROM device emulator
License: GPL-2.0-or-later
Group: System/Daemons
URL: https://cdemu.sourceforge.io/about/daemon/
#Git-Clone: https://github.com/cdemu/cdemu
Source: https://downloads.sf.net/cdemu/%name-%version.tar.xz
Source2: 60-vhba.rules
@ -36,7 +34,7 @@ Source3: cdemu-daemon.sysconfig
Source4: cdemu-daemon.service
BuildRequires: cmake >= 2.8.5
BuildRequires: intltool >= 0.21
BuildRequires: pkg-config >= 0.16
BuildRequires: pkgconfig >= 0.16
BuildRequires: pkgconfig(ao) >= 0.8.0
BuildRequires: pkgconfig(gio-2.0) >= 2.30
BuildRequires: pkgconfig(glib-2.0) >= 2.30
@ -44,10 +42,9 @@ BuildRequires: pkgconfig(gmodule-2.0) >= 2.30
BuildRequires: pkgconfig(gobject-2.0) >= 2.30
BuildRequires: pkgconfig(gthread-2.0) >= 2.30
BuildRequires: pkgconfig(libmirage) >= 3.2.0
Requires(pre): %fillup_prereq
Requires: vhba-kmp
Requires(pre): %fillup_prereq
Recommends: %name-lang
%lang_package
%description
@ -69,14 +66,14 @@ that can be used by clients to control it.
%cmake_build
%install
b="%buildroot"
b=%{buildroot}
%cmake_install
mkdir -p "$b/%_sbindir" "$b/%_fillupdir" \
"$b/%_prefix/lib/udev/rules.d"
install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
install -pm0644 "%{S:3}" "$b/%_fillupdir/sysconfig.cdemu-daemon"
install -pm0644 "%{SOURCE2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
install -pm0644 "%{SOURCE3}" "$b/%_fillupdir/sysconfig.cdemu-daemon"
mkdir -p "$b/%_userunitdir"
install -pm0644 "%{S:4}" "$b/%_userunitdir/cdemu-daemon.service"
install -pm0644 "%{SOURCE4}" "$b/%_userunitdir/cdemu-daemon.service"
mkdir -p "$b/%_datadir/dbus-1/services"
install -pm0644 "service-example/net.sf.cdemu.CDEmuDaemon.service" "$b/%_datadir/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service"
%find_lang %name