* [PATCH 0 of 5] Several fixes for autoconf and xencommons
@ 2012-02-21 21:10 Roger Pau Monne
2012-02-21 21:10 ` [PATCH 1 of 5] autoconf: remove (yet another) brctl leftover Roger Pau Monne
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Roger Pau Monne @ 2012-02-21 21:10 UTC (permalink / raw)
To: xen-devel
Fix autoconf under NetBSD and add some tests to Linux xencommons to
check for the necessary tools to run hotplug scripts.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1 of 5] autoconf: remove (yet another) brctl leftover
2012-02-21 21:10 [PATCH 0 of 5] Several fixes for autoconf and xencommons Roger Pau Monne
@ 2012-02-21 21:10 ` Roger Pau Monne
2012-02-21 21:10 ` [PATCH 2 of 5] autconf: remove ip check Roger Pau Monne
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monne @ 2012-02-21 21:10 UTC (permalink / raw)
To: xen-devel
# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1329857655 -3600
# Node ID 72fc6b55447b9f45fd4d8a5d7ef09d4dd899edc2
# Parent a4d93d0e0df2fafe5b3e2dab3e34799498a875e2
autoconf: remove (yet another) brctl leftover
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
diff -r a4d93d0e0df2 -r 72fc6b55447b config/Tools.mk.in
--- a/config/Tools.mk.in Wed Feb 22 14:33:24 2012 +0000
+++ b/config/Tools.mk.in Tue Feb 21 21:54:15 2012 +0100
@@ -11,7 +11,6 @@ FLEX := @FLEX@
PYTHON := @PYTHON@
PYTHON_PATH := @PYTHONPATH@
PERL := @PERL@
-BRCTL := @BRCTL@
IP := @IP@
CURL_CONFIG := @CURL@
XML2_CONFIG := @XML@
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2 of 5] autconf: remove ip check
2012-02-21 21:10 [PATCH 0 of 5] Several fixes for autoconf and xencommons Roger Pau Monne
2012-02-21 21:10 ` [PATCH 1 of 5] autoconf: remove (yet another) brctl leftover Roger Pau Monne
@ 2012-02-21 21:10 ` Roger Pau Monne
2012-02-21 21:10 ` [PATCH 3 of 5] autoconf: run libuuid test under Linux only Roger Pau Monne
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monne @ 2012-02-21 21:10 UTC (permalink / raw)
To: xen-devel
# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1330003783 -3600
# Node ID 21734a9d28823bdda72423282582ff973289c758
# Parent 72fc6b55447b9f45fd4d8a5d7ef09d4dd899edc2
autconf: remove ip check
ip is a run-time dependency, and it is not needed to build Xen tools.
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
diff -r 72fc6b55447b -r 21734a9d2882 config/Tools.mk.in
--- a/config/Tools.mk.in Tue Feb 21 21:54:15 2012 +0100
+++ b/config/Tools.mk.in Thu Feb 23 14:29:43 2012 +0100
@@ -11,7 +11,6 @@ FLEX := @FLEX@
PYTHON := @PYTHON@
PYTHON_PATH := @PYTHONPATH@
PERL := @PERL@
-IP := @IP@
CURL_CONFIG := @CURL@
XML2_CONFIG := @XML@
BASH := @BASH@
diff -r 72fc6b55447b -r 21734a9d2882 tools/configure
--- a/tools/configure Tue Feb 21 21:54:15 2012 +0100
+++ b/tools/configure Thu Feb 23 14:29:43 2012 +0100
@@ -637,7 +637,6 @@ XML
CURL
FLEX
BISON
-IP
PERL
PYTHON
APPEND_LIB
@@ -739,7 +738,6 @@ APPEND_INCLUDES
APPEND_LIB
PYTHON
PERL
-IP
BISON
FLEX
CURL
@@ -1394,7 +1392,6 @@ Some influential environment variables:
APPEND_LIB List of library folders to append to LDFLAGS (without -L)
PYTHON Path to the Python parser
PERL Path to Perl parser
- IP Path to ip tool
BISON Path to Bison parser generator
FLEX Path to Flex lexical analyser generator
CURL Path to curl-config tool
@@ -4158,7 +4155,6 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPE
-
# Checks for programs.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
@@ -4949,51 +4945,6 @@ if test x"${PERL}" == x"no"
then
as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5
fi
-# Extract the first word of "ip", so it can be a program name with args.
-set dummy ip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_IP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $IP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_IP="$IP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_IP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_IP" && ac_cv_path_IP="no"
- ;;
-esac
-fi
-IP=$ac_cv_path_IP
-if test -n "$IP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IP" >&5
-$as_echo "$IP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test x"${IP}" == x"no"
-then
- as_fn_error $? "Unable to find ip, please install ip" "$LINENO" 5
-fi
# Extract the first word of "bison", so it can be a program name with args.
set dummy bison; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -r 72fc6b55447b -r 21734a9d2882 tools/configure.ac
--- a/tools/configure.ac Tue Feb 21 21:54:15 2012 +0100
+++ b/tools/configure.ac Thu Feb 23 14:29:43 2012 +0100
@@ -62,7 +62,6 @@ AX_SET_FLAGS
AC_ARG_VAR([PYTHON], [Path to the Python parser])
AC_ARG_VAR([PERL], [Path to Perl parser])
-AC_ARG_VAR([IP], [Path to ip tool])
AC_ARG_VAR([BISON], [Path to Bison parser generator])
AC_ARG_VAR([FLEX], [Path to Flex lexical analyser generator])
AC_ARG_VAR([CURL], [Path to curl-config tool])
@@ -77,7 +76,6 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AX_PATH_PROG_OR_FAIL([PERL], [perl])
-AX_PATH_PROG_OR_FAIL([IP], [ip])
AX_PATH_PROG_OR_FAIL([BISON], [bison])
AX_PATH_PROG_OR_FAIL([FLEX], [flex])
AS_IF([test "x$xapi" = "xy"], [
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3 of 5] autoconf: run libuuid test under Linux only
2012-02-21 21:10 [PATCH 0 of 5] Several fixes for autoconf and xencommons Roger Pau Monne
2012-02-21 21:10 ` [PATCH 1 of 5] autoconf: remove (yet another) brctl leftover Roger Pau Monne
2012-02-21 21:10 ` [PATCH 2 of 5] autconf: remove ip check Roger Pau Monne
@ 2012-02-21 21:10 ` Roger Pau Monne
2012-02-21 21:10 ` [PATCH 4 of 5] Linux/init: check for brctl and ip at xencommons Roger Pau Monne
2012-02-21 21:10 ` [PATCH 5 of 5] Linux/init: check for udev >= 59 " Roger Pau Monne
4 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monne @ 2012-02-21 21:10 UTC (permalink / raw)
To: xen-devel
# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1330004063 -3600
# Node ID 8bd684735341cd4e41aa6ea1047556a88b84f625
# Parent 21734a9d28823bdda72423282582ff973289c758
autoconf: run libuuid test under Linux only
libuuid is only required to compile Xen tools under Linux.
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
diff -r 21734a9d2882 -r 8bd684735341 tools/configure
--- a/tools/configure Thu Feb 23 14:29:43 2012 +0100
+++ b/tools/configure Thu Feb 23 14:34:23 2012 +0100
@@ -6840,7 +6840,9 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
+if test "x$host_os" == "xlinux-gnu"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
$as_echo_n "checking for uuid_clear in -luuid... " >&6; }
if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
$as_echo_n "(cached) " >&6
@@ -6887,6 +6889,8 @@ else
as_fn_error $? "Could not find libuuid" "$LINENO" 5
fi
+
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5
$as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then :
diff -r 21734a9d2882 -r 8bd684735341 tools/configure.ac
--- a/tools/configure.ac Thu Feb 23 14:29:43 2012 +0100
+++ b/tools/configure.ac Thu Feb 23 14:34:23 2012 +0100
@@ -120,8 +120,10 @@ AC_SUBST(libgcrypt)
AC_CHECK_LIB([pthread], [pthread_create], [] ,
[AC_MSG_ERROR([Could not find libpthread])])
AC_CHECK_LIB([rt], [clock_gettime])
-AC_CHECK_LIB([uuid], [uuid_clear], [],
- [AC_MSG_ERROR([Could not find libuuid])])
+AS_IF([test "x$host_os" == "xlinux-gnu"], [
+ AC_CHECK_LIB([uuid], [uuid_clear], [],
+ [AC_MSG_ERROR([Could not find libuuid])])
+])
AC_CHECK_LIB([yajl], [yajl_alloc], [],
[AC_MSG_ERROR([Could not find yajl])])
AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4 of 5] Linux/init: check for brctl and ip at xencommons
2012-02-21 21:10 [PATCH 0 of 5] Several fixes for autoconf and xencommons Roger Pau Monne
` (2 preceding siblings ...)
2012-02-21 21:10 ` [PATCH 3 of 5] autoconf: run libuuid test under Linux only Roger Pau Monne
@ 2012-02-21 21:10 ` Roger Pau Monne
2012-02-21 21:10 ` [PATCH 5 of 5] Linux/init: check for udev >= 59 " Roger Pau Monne
4 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monne @ 2012-02-21 21:10 UTC (permalink / raw)
To: xen-devel
# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1329811412 -3600
# Node ID 6c6c59861319b2be13fde935e20b62ead39905ca
# Parent 8bd684735341cd4e41aa6ea1047556a88b84f625
Linux/init: check for brctl and ip at xencommons
Check for brctl and ip at xencommons, since hotplug scripts use it.
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
diff -r 8bd684735341 -r 6c6c59861319 tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons Thu Feb 23 14:34:23 2012 +0100
+++ b/tools/hotplug/Linux/init.d/xencommons Tue Feb 21 09:03:32 2012 +0100
@@ -50,6 +50,14 @@ if test -f /proc/xen/capabilities && \
exit 0
fi
+# List of tools needed by xen (hotplug scripts)
+REQ_TOOLS="brctl ip"
+
+for tool in $REQ_TOOLS
+do
+ hash $tool > /dev/null 2>&1 || echo "Warning: $tool not found"
+done
+
do_start () {
local time=0
local timeout=30
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 5 of 5] Linux/init: check for udev >= 59 at xencommons
2012-02-21 21:10 [PATCH 0 of 5] Several fixes for autoconf and xencommons Roger Pau Monne
` (3 preceding siblings ...)
2012-02-21 21:10 ` [PATCH 4 of 5] Linux/init: check for brctl and ip at xencommons Roger Pau Monne
@ 2012-02-21 21:10 ` Roger Pau Monne
4 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monne @ 2012-02-21 21:10 UTC (permalink / raw)
To: xen-devel
# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1329814249 -3600
# Node ID 9fa89fb4ee2b3a587ec537c404a270f0c0e2169d
# Parent 6c6c59861319b2be13fde935e20b62ead39905ca
Linux/init: check for udev >= 59 at xencommons
Check for udev at xencommons, since hotplug scripts use it.
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
diff -r 6c6c59861319 -r 9fa89fb4ee2b tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons Tue Feb 21 09:03:32 2012 +0100
+++ b/tools/hotplug/Linux/init.d/xencommons Tue Feb 21 09:50:49 2012 +0100
@@ -58,6 +58,26 @@ do
hash $tool > /dev/null 2>&1 || echo "Warning: $tool not found"
done
+# Check for udev >= 59
+if ! hash udevadm > /dev/null 2>&1
+then
+ if ! hash udevinfo > /dev/null 2>&1
+ then
+ echo "Warning: unable to find udevadm or udevinfo"
+ else
+ udevver=`udevinfo -V | awk '{print $NF}'`
+ fi
+else
+ udevver=`udevadm info -V | awk '{print $NF}'`
+fi
+if test -z "${udevver}" || test "${udevver}" -lt 59
+then
+ if ! hash hotplug > /dev/null 2>&1
+ then
+ echo "Warning: udev is too old, upgrade to version 59 or later"
+ fi
+fi
+
do_start () {
local time=0
local timeout=30
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-21 21:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-21 21:10 [PATCH 0 of 5] Several fixes for autoconf and xencommons Roger Pau Monne
2012-02-21 21:10 ` [PATCH 1 of 5] autoconf: remove (yet another) brctl leftover Roger Pau Monne
2012-02-21 21:10 ` [PATCH 2 of 5] autconf: remove ip check Roger Pau Monne
2012-02-21 21:10 ` [PATCH 3 of 5] autoconf: run libuuid test under Linux only Roger Pau Monne
2012-02-21 21:10 ` [PATCH 4 of 5] Linux/init: check for brctl and ip at xencommons Roger Pau Monne
2012-02-21 21:10 ` [PATCH 5 of 5] Linux/init: check for udev >= 59 " Roger Pau Monne
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.