[Pkg-utopia-commits] r1475 - in /packages/unstable/hal/debian: changelog run-hald.sh

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon May  7 21:09:18 2007
New Revision: 1475

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1475
Log:
Merge one more change from pitti:
* Put absolute paths in HALD_RUNNER_PATH so that callouts are found, too.
  Minor change: Don't change into build-tree/hal-*, because we don't use tarball.mk anymore.


Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/run-hald.sh

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1475&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Mon May  7 21:09:18 2007
@@ -18,6 +18,9 @@
       + Fix scrambled labels. (FD #10362, LP #69914)
     - debian/hal.init.dbus
       + Use actual init script path in usage help.
+    - debian/run-hald.sh
+      + Put absolute paths in HALD_RUNNER_PATH so that callouts are found,
+        too.
 
   * debian/control
     - Drop Build-Depends: linux-kernel-headers (>= 2.6.17).

Modified: packages/unstable/hal/debian/run-hald.sh
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/run-hald.sh?rev=1475&op=diff
==============================================================================
--- packages/unstable/hal/debian/run-hald.sh (original)
+++ packages/unstable/hal/debian/run-hald.sh Mon May  7 21:09:18 2007
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-cd build-tree/hal-*/hald
-export HALD_RUNNER_PATH=linux2:linux2/probing:linux2/addons:.:../tools:../tools/linux
+cd hald
+P="`pwd`"
+export HALD_RUNNER_PATH=$P/linux:$P/linux/probing:$P/linux/addons:.:../tools:../tools/linux
 export PATH=../hald-runner:$PATH
 export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe
 export HAL_FDI_SOURCE_INFORMATION=../fdi/information