Module: xenomai-2.4
Branch: master
Commit: 24a74cfa3f16faf5f56dbb42dcc9b6521973551e
URL:    
http://git.xenomai.org/?p=xenomai-2.4.git;a=commit;h=24a74cfa3f16faf5f56dbb42dcc9b6521973551e

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue May 19 17:24:04 2009 +0200

Fix patch selection with --enable-linux-build

---

 configure    |    7 +------
 configure.in |    7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 87aef72..6440c3a 100755
--- a/configure
+++ b/configure
@@ -12637,12 +12637,7 @@ fi
 
 
   if test x"$ADEOS_PATCH" = x && test x"$linux_base_version" != x ; then
-        set -- 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-*$linux_base_version*-$XENO_LINUX_ARCH-*
-        ADEOS_PATCH=$1
-       if test ! -e $ADEOS_PATCH; then
-               set -- 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-*$linux_base_version*-$XENO_TARGET_ARCH-*
-               ADEOS_PATCH=$1
-       fi
+        ADEOS_PATCH="`( ls 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-ipipe-$linux_version*-{$XENO_TARGET_ARCH,$XENO_LINUX_ARCH}-*|sort
 -r ) 2>/dev/null | head -n1`"
   fi
   if test x"$ADEOS_PATCH" = x || test ! -e $ADEOS_PATCH ; then
      { { echo "$as_me:$LINENO: error: Unable to find Adeos patch, please use 
--with-adeos-patch" >&5
diff --git a/configure.in b/configure.in
index d696d86..42e7229 100644
--- a/configure.in
+++ b/configure.in
@@ -345,12 +345,7 @@ patch. Default is to infer the patch name from Linux 
kernel version.]),
         [ADEOS_PATCH="`/bin/bash -c \"echo $withval\"`"])
 
   if test x"$ADEOS_PATCH" = x && test x"$linux_base_version" != x ; then
-        set -- 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-*$linux_base_version*-$XENO_LINUX_ARCH-*
-        ADEOS_PATCH=$1
-       if test ! -e $ADEOS_PATCH; then
-               set -- 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-*$linux_base_version*-$XENO_TARGET_ARCH-*
-               ADEOS_PATCH=$1
-       fi
+        ADEOS_PATCH="`( ls 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-ipipe-$linux_version*-{$XENO_TARGET_ARCH,$XENO_LINUX_ARCH}-*|sort
 -r ) 2>/dev/null | head -n1`"
   fi
   if test x"$ADEOS_PATCH" = x || test ! -e $ADEOS_PATCH ; then
      AC_MSG_ERROR([Unable to find Adeos patch, please use --with-adeos-patch])


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to