Re: [Xenomai-core] [BUG] prepare-kernel is broken

[Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>]

[-- Attachment #1: message body text --]
[-- Type: text/plain, Size: 375 bytes --]

Jan Kiszka wrote:
 > Hi,
 > 
 > the last check-in seems to have messed something up:
 > 
 > .../xenomai/scripts/prepare-kernel.sh: line 61: syntax error near
 > unexpected token `fi'
 > 
 > I do not understand what's going on here, so I don't want to hack some
 > probably wrong fix for this.

In order to have it work, I had to make the following changes to
revision 610 :


[-- Attachment #2: prepare-kernel.diff --]
[-- Type: text/plain, Size: 1067 bytes --]

Index: prepare-kernel.sh
===================================================================
--- prepare-kernel.sh	(revision 610)
+++ prepare-kernel.sh	(working copy)
@@ -42,7 +42,7 @@
         recursive_opt=""
         directorytype_opt=""
         if test x$recursive = xr; then
-            directorytype_opt="\( -type d -mindepth 1 \) -o"
+            directorytype_opt="( -type d -mindepth 1 ) -o"
         else
             recursive_opt="-maxdepth 1"
         fi
@@ -51,13 +51,13 @@
             link_makefiles_opt="-name Makefile -o"
         fi
 
-        if test "x$output_patch" = "x"; then
+        if test "x$output_patch" = "x" -a -e $linux_tree/$link_dir; then
             cd $linux_tree/$link_dir &&
 	    find . $recursive_opt \( $directorytype_opt \
                 $link_makefiles_opt -name $config_file -o -name '*.[chS]' \) |
             while read f; do
                 if test ! -e $xenomai_root/$target_dir/$f; then rm -Rf $f; fi
-            done; else true; fi &&
+            done
         fi
 
         cd $xenomai_root/$target_dir &&

[-- Attachment #3: .signature --]
[-- Type: text/plain, Size: 38 bytes --]


-- 


					    Gilles Chanteperdrix.