[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Please approve vdr 1.2.6-13 for sarge



Hi Thomas,

On Wed, May 18, 2005 at 09:49:54PM +0200, Thomas Schmidt wrote:
> Please consider vdr 1.2.6-13 for inclusion in sarge, it was uploaded
> on allmoast 2 weeks agon, but if forgot to ask about inclusion into 
> sarge until now. 

> It fixes an important bug, which is affecting amd64 users (the
> init-script would not work without modifications on amd64), the other
> changes are very small and should not cause any problems - interdiff
> between 1.2.6-12 and 1.2.6-13 is attached.

> Here is the last entry from the changelog:

>  vdr (1.2.6-13) unstable; urgency=medium
>  .
>    * Darren Salt <linux@youmustbejoking.demon.co.uk>
>      - Make the usage of NPTL configurable in /etc/default/vdr
>      - Disable the usage of NPTL on amd64 in runvdr (this allways
>        overrides  the setting in /etc/default/vdr) (closes: #305098)
>    * Thomas Schmidt <tschmidt@debian.org>
>      - Added psmisc to the depends of the package vdr (thanks to Martin
>        Langer <martin-langer@gmx.de> for the hint)

Approved.

--- vdr-1.2.6/debian/runvdr
+++ vdr-1.2.6/debian/runvdr
@@ -5,7 +5,11 @@
 . /usr/lib/vdr/config-loader.sh
 
 OPTIONS="$*"
-VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
+  VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+else
+  VDRCMD="/usr/bin/vdr $OPTIONS"
+fi
 
 function get_modulenames ()
 {

Note that this particular method of checking for amd64 means that machines
running the Debian i386 port with the amd64 kernel package installed will
also always end up with NPTL.  I'm not sure if that's desired or not, but I
figured I'd mention it to you.

Cheers,
-- 
Steve Langasek
postmodern programmer

Attachment: signature.asc
Description: Digital signature


Reply to: