Module: xenomai-2.6
Branch: master
Commit: 89ff2edf76dae49e4a3643f17e118954b68a692e
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=89ff2edf76dae49e4a3643f17e118954b68a692e

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Thu Dec 27 15:32:19 2012 +0100

debian: adapt to latest I-pipe core patches

---

 debian/rules             |    2 +-
 scripts/prepare-patch.sh |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 634ecf5..ff59ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,7 @@ install: build
        dh_install --sourcedir=$(CURDIR)/debian/tmp
        # Patch collection:
        mkdir -p 
$(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/diffs/xenomai
-       cp adeos-ipipe-*.patch 
$(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/diffs/xenomai
+       cp *ipipe-*.patch 
$(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/diffs/xenomai
        # xeno-config should be only in libxenomai-dev
        rm -f $(CURDIR)/debian/xenomai-runtime/usr/bin/xeno-config
        rm -f $(CURDIR)/debian/xenomai-runtime/usr/share/man/man1/xeno-config.1
diff --git a/scripts/prepare-patch.sh b/scripts/prepare-patch.sh
index c23ee90..f2e67f7 100755
--- a/scripts/prepare-patch.sh
+++ b/scripts/prepare-patch.sh
@@ -21,7 +21,7 @@ patch_append() {
 #    echo "diff -u1wbr orig/$file new/$file" >> $patch_file
     echo "--- linux/$file      1970-01-01 01:00:00.000000000 +0100" >> 
$patch_file
     echo "+++ linux-patched/$file      2007-03-06 17:55:58.000000000 +0000" >> 
$patch_file
-    echo "@@ -500,0 +500,2 @@" >> $patch_file
+    echo "@@ -500000,0 +500000,2 @@" >> $patch_file
     echo "+" >> $patch_file
     cat >> $patch_file
 }
@@ -78,7 +78,7 @@ diff_addons() {
 
     echo "--- linux/init/Kconfig       1970-01-01 01:00:00.000000000 +0100" >> 
$patch_file
     echo "+++ linux-patched/init/Kconfig       2007-03-06 17:55:58.000000000 
+0000" >> $patch_file
-    echo "@@ -1400,0 +1400,$lines @@" >> $patch_file
+    echo "@@ -500000,0 +500000,$lines @@" >> $patch_file
     sed -e "s,@LINUX_ARCH@,$linux_arch,g" $xenomai_root/scripts/Kconfig.frag | 
sed 's/^/+/' >> $patch_file
     echo " " >> $patch_file
 }
@@ -148,7 +148,7 @@ generate_patch >> $patch_file
 
 cd $xenomai_root
 
-find $xenomai_root/ksrc/ -name "adeos-ipipe-2.6.*-$supported_arch-*.patch" |
+find $xenomai_root/ksrc/ -name "*ipipe*-$supported_arch-*.patch" |
 while read f ; do
 
     file=`basename $f`


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

Reply via email to