From 903b8e1c96a0591263ce8c7893ca9ec607639cb2ead60d7af01417fbe1d5c158 Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Fri, 28 Feb 2014 01:05:07 +0000 Subject: [PATCH] Accepting request 224106 from home:msmeissn:branches:Base:System - do not specify the cpu: ControlGroup, unsupported by systemd currently. bnc#847948 OBS-URL: https://build.opensuse.org/request/show/224106 OBS-URL: https://build.opensuse.org/package/show/Base:System/rtkit?expand=0&rev=23 --- rtkit-no-cpu-controlgroup.patch | 14 ++++++++++++++ rtkit.changes | 6 ++++++ rtkit.spec | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 rtkit-no-cpu-controlgroup.patch diff --git a/rtkit-no-cpu-controlgroup.patch b/rtkit-no-cpu-controlgroup.patch new file mode 100644 index 0000000..4dffa1f --- /dev/null +++ b/rtkit-no-cpu-controlgroup.patch @@ -0,0 +1,14 @@ +Index: rtkit-0.11_git201205151338/rtkit-daemon.service.in +=================================================================== +--- rtkit-0.11_git201205151338.orig/rtkit-daemon.service.in ++++ rtkit-0.11_git201205151338/rtkit-daemon.service.in +@@ -29,7 +29,8 @@ PrivateNetwork=yes + + # Work around the fact that the Linux currently doesn't assign any RT + # budget to CPU control groups that have none configured explicitly +-ControlGroup=cpu:/ ++# Not specified by systemd currently. ++# ControlGroup=cpu:/ + + [Install] + WantedBy=graphical.target diff --git a/rtkit.changes b/rtkit.changes index aa7def9..7261966 100644 --- a/rtkit.changes +++ b/rtkit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 27 13:28:28 UTC 2014 - meissner@suse.com + +- do not specify the cpu: ControlGroup, unsupported by systemd + currently. bnc#847948 + ------------------------------------------------------------------- Fri Sep 27 22:21:16 UTC 2013 - sreeves@suse.com diff --git a/rtkit.spec b/rtkit.spec index 8422152..003892f 100644 --- a/rtkit.spec +++ b/rtkit.spec @@ -1,7 +1,7 @@ # # spec file for package rtkit # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,7 @@ BuildRequires: pkgconfig(libsystemd-daemon) Patch0: rtkit-use-system-sd-daemon.patch # PATCH-FIX-UPSTREAM rtkit-bnc836939.patch sreeves@suse.com -- use of insecure polkit DBUS API Patch1: rtkit-bnc836939.patch +Patch2: rtkit-no-cpu-controlgroup.patch %description RealtimeKit is a D-Bus system service that changes the @@ -53,6 +54,7 @@ processes. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -fiv