r850 - in /trunk/boinc/debian: boinc-client.init boinc-client.install boinc-client.udev changelog extra/udev-usr_share rules

Thu Feb 21 20:50:25 UTC 2008

Author: fst
Date: Thu Feb 21 20:50:24 2008
New Revision: 850

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=850
Log:
Merged the workaround from Ubuntu's 5.10.30-5ubuntu3 for Linux's new CFS,
refer to #461630 for details. Thanks to Daniel Hahler <daniel at thequod.de>.

Added:
    trunk/boinc/debian/boinc-client.udev
    trunk/boinc/debian/extra/udev-usr_share   (with props)
Modified:
    trunk/boinc/debian/boinc-client.init
    trunk/boinc/debian/boinc-client.install
    trunk/boinc/debian/changelog
    trunk/boinc/debian/rules

Modified: trunk/boinc/debian/boinc-client.init
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.init?rev=850&op=diff
==============================================================================

--- trunk/boinc/debian/boinc-client.init (original)
+++ trunk/boinc/debian/boinc-client.init Thu Feb 21 20:50:24 2008
@@ -148,6 +148,13 @@
         schedtool $children
       fi
     fi
+
+    # Display cpu_share info:
+    UID=`id -u $BOINC_USER`
+    CPU_SHARE_FILE="/sys/kernel/uids/$UID/cpu_share"
+    if [ -f "$CPU_SHARE_FILE" ]; then
+      log_success_msg "cpu_share: `cat "$CPU_SHARE_FILE"`"
+    fi
   else
     log_success_msg "$STATUS stopped."
   fi

Modified: trunk/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.install?rev=850&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.install (original)
+++ trunk/boinc/debian/boinc-client.install Thu Feb 21 20:50:24 2008
@@ -1,6 +1,7 @@
 debian/bug/boinc-client/script      usr/share/bug/boinc-client
 debian/conffiles/*                  etc/boinc-client
 debian/extra/bash/*                 etc/bash_completion.d
+debian/extra/udev-usr_share         usr/lib/boinc-client
 debian/extra/update-boinc-applinks  usr/bin
 debian/overrides/boinc-client       usr/share/lintian/overrides
 debian/tmp/usr/bin/switcher         usr/lib/boinc-client

Added: trunk/boinc/debian/boinc-client.udev
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.udev?rev=850&op=file
==============================================================================
--- trunk/boinc/debian/boinc-client.udev (added)
+++ trunk/boinc/debian/boinc-client.udev Thu Feb 21 20:50:24 2008
@@ -1,0 +1,1 @@
+SUBSYSTEM=="kernel", DEVPATH=="/kernel/uids/*", ACTION=="add", RUN+="/usr/lib/boinc-client/udev-usr_share"

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=850&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Thu Feb 21 20:50:24 2008
@@ -12,8 +12,42 @@
     intended for a wider audience.
   * Reverted the debhelper compat level bump. It was just unnecessary (boinc
     does not need V6) and would have made backporting harder.
-
- -- Frank S. Thomas <fst at debian.org>  Wed, 20 Feb 2008 16:03:29 +0100
+  * Merged the workaround from Ubuntu's 5.10.30-5ubuntu3 for Linux's new CFS,
+    refer to #461630 for details. Thanks to Daniel Hahler <daniel at thequod.de>.
+
+ -- Frank S. Thomas <fst at debian.org>  Thu, 21 Feb 2008 13:53:43 +0100
+
+boinc (5.10.30-5ubuntu3) hardy; urgency=low
+
+  * Install /usr/lib/boinc-client/udev-usr_share with correct perms
+    (executable), so that it gets called by udevd.
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Mon, 04 Feb 2008 00:40:08 +0100
+
+boinc (5.10.30-5ubuntu2) hardy; urgency=low
+
+  * Revert changes from ubuntu1 and instead use the uevent udev
+    interface to assign the lowest possible cpu_share to the
+    boinc user. This is still considered to be a workaround.
+    - Add debian/boinc-client.udev
+    - debian/rules: call dh_installudev
+    - Add debian/extra/udev-usr_share, which gets run by udevd
+    - Drop debian/patches/ubuntu_temp_cfs_fix.patch
+  * debian/boinc-client.init: Display cpu_share info for "status"
+    action
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 02 Feb 2008 23:32:25 +0100
+
+boinc (5.10.30-5ubuntu1) hardy; urgency=low
+
+  * debian/patches/ubuntu_temp_cfs_fix.patch:
+    Temporary workaround for the new CFS Linux scheduler,
+    by adjusting the "boinc" user's cpu_share to the minimum (2)
+    in the init script (LP: #177713)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 02 Feb 2008 02:48:01 +0100
 
 boinc (5.10.30-5) unstable; urgency=low
 

Added: trunk/boinc/debian/extra/udev-usr_share
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/extra/udev-usr_share?rev=850&op=file
==============================================================================
--- trunk/boinc/debian/extra/udev-usr_share (added)
+++ trunk/boinc/debian/extra/udev-usr_share Thu Feb 21 20:50:24 2008
@@ -1,0 +1,17 @@
+#!/bin/sh
+#
+# This script gets called by udev, when an entry in
+# /sys/kernel/uids gets added.
+#
+# It is used by boinc-client to assign the lowest
+# possible cpu_share of 2 to the boinc user.
+#
+#       ACTION=add
+#       DEVPATH=/kernel/uids/[uid]
+
+set -e
+
+UID=${DEVPATH##*/}
+if [ "$UID" = "$(id -u boinc)" ]; then
+    echo 2 > /sys/$DEVPATH/cpu_share
+fi

Propchange: trunk/boinc/debian/extra/udev-usr_share
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/rules?rev=850&op=diff
==============================================================================
--- trunk/boinc/debian/rules (original)
+++ trunk/boinc/debian/rules Thu Feb 21 20:50:24 2008
@@ -239,12 +239,14 @@
 	dh_desktop -a
 	dh_installinit -a
 	dh_installman -a
+	dh_installudev -a
 	dh_buildinfo -a
 	dh_link -a
 	dh_strip -a --dbg-package=boinc-dbg
 	dh_compress -a
 	dh_fixperms -a
 	chmod 755 \
+	  debian/boinc-client/usr/lib/boinc-client/udev-usr_share \
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
 	dh_installdeb -a


