[PATCH 2/4] allow running hald for testing without hal-info
Guillem Jover
guillem.jover at nokia.com
Mon Nov 3 14:16:17 PST 2008
Change the error to a warning, so that hald can be tested without
the hal-info fdis around.
---
hald/setup-hald.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hald/setup-hald.sh b/hald/setup-hald.sh
index f5761bb..d6d71d0 100644
--- a/hald/setup-hald.sh
+++ b/hald/setup-hald.sh
@@ -19,12 +19,12 @@ else
mkdir -p $HALD_TMPDIR
make -C ../policy install DESTDIR=$HALD_TMPDIR prefix=/
make -C ../fdi install DESTDIR=$HALD_TMPDIR prefix=/ && \
- if [ ! -d $information_fdidir ] ; then
- echo "ERROR: You need to checkout hal-info in the same level"
+ if [ -d $information_fdidir ] ; then
+ make -C $information_fdidir install DESTDIR=$HALD_TMPDIR prefix=/
+ else
+ echo "WARNING: You need to checkout hal-info in the same level"
echo "directory as hal to get the information fdi files."
- exit
fi
- make -C $information_fdidir install DESTDIR=$HALD_TMPDIR prefix=/
fi
export HAL_FDI_SOURCE_PREPROBE=$HALD_TMPDIR/share/hal/fdi/preprobe
export HAL_FDI_SOURCE_INFORMATION=$HALD_TMPDIR/share/hal/fdi/information
--
1.6.0.2
More information about the hal
mailing list