Module: xenomai-jki
Branch: queues/ftrace
Commit: 761eeb18feaad9b35edcbc4a9af4a4c526bd2596
URL:    
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=761eeb18feaad9b35edcbc4a9af4a4c526bd2596

Author: Jan Kiszka <jan.kis...@siemens.com>
Date:   Fri Nov 26 17:47:15 2010 +0100

prepare-kernel: Only purge links from target directories

Only remove files from the target directory of patch_link if they are
missing in Xenomai AND are actually symbolic links. This is required
when merging Xenomai directories into non-empty kernel dirs.

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 scripts/prepare-kernel.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 36f9a4a..5f4043a 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -103,7 +103,7 @@ patch_link() {
            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
+                if test -L $f -a ! -e $xenomai_root/$target_dir/$f; then rm 
-Rf $f; fi
             done
         fi
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to