X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flttng-6-split-script.sh;h=8152d0c8007e776c7e09971de948aaef21582f57;hb=c3ba614d739be0c231a20c5d0944d848f7e9f3b9;hp=f2562b849295e220244828a4948e4f31379179eb;hpb=09e2393ea9c3f2bfd1d700f45b86572e487cce1d;p=lttv.git

diff --git a/scripts/lttng-6-split-script.sh b/scripts/lttng-6-split-script.sh
index f2562b84..8152d0c8 100755
--- a/scripts/lttng-6-split-script.sh
+++ b/scripts/lttng-6-split-script.sh
@@ -12,7 +12,7 @@ function wr () {
 
 
 PRENAME=patch
-NAME=-2.6.20-rc4-git3-lttng-$1
+NAME=-2.6.20-lttng-$1
 ALL_NAME=${PRENAME}${NAME}-all.diff
 VALUE=1
 printf -v COUNT "%02d" ${VALUE}
@@ -34,6 +34,21 @@ for a in *; do
 	rm $a.tmp;
 done
 
+#hotfix 2.6.20
+FILE=../${PRENAME}${COUNT}${NAME}-hotfix.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-powerpc_prom.h
+?_include_asm-sparc64_tlb.h
+?_kernel_time_clocksource.c
+?_include_asm-ppc_ocp.h
+?_arch_powerpc_kernel_setup_32.c
+?_arch_ppc_kernel_setup.c"
+
+for a in $IN; do wr $a $FILE; done
+
+
 #for hotplug
 FILE=../${PRENAME}${COUNT}${NAME}-relay.diff
 VALUE=$(( ${VALUE} + 1 ))
@@ -48,15 +63,15 @@ for a in $IN; do wr $a $FILE; done
 
 #kprobes
 
-for a in $IN; do wr $a $FILE; done
-
-FILE=../${PRENAME}${COUNT}${NAME}-kprobes.diff
-VALUE=$(( ${VALUE} + 1 ))
-printf -v COUNT "%02d" ${VALUE}
-
-IN="?_include_linux_kprobes.h
-?_arch_i386_kernel_kprobes.c
-?_kernel_kprobes.c"
+#FILE=../${PRENAME}${COUNT}${NAME}-kprobes.diff
+#VALUE=$(( ${VALUE} + 1 ))
+#printf -v COUNT "%02d" ${VALUE}
+#
+#IN="?_include_linux_kprobes.h
+#?_arch_i386_kernel_kprobes.c
+#?_kernel_kprobes.c"
+#
+#for a in $IN; do wr $a $FILE; done
 
 #Markers
 
@@ -75,7 +90,8 @@ printf -v COUNT "%02d" ${VALUE}
 
 IN="?_include_asm-generic_vmlinux.lds.h
 ?_include_linux_module.h
-?_include_linux_marker.h"
+?_include_linux_marker.h
+?_include_linux_kernel.h"
 
 for a in $IN; do wr $a $FILE; done
 
@@ -84,7 +100,9 @@ FILE=../${PRENAME}${COUNT}${NAME}-markers-i386.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-i386_marker.h"
+IN="?_include_asm-i386_marker.h
+?_arch_i386_kernel_marker.c
+?_arch_i386_kernel_Makefile"
 
 for a in $IN; do wr $a $FILE; done
 
@@ -94,7 +112,9 @@ FILE=../${PRENAME}${COUNT}${NAME}-markers-powerpc.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-powerpc_marker.h"
+IN="?_include_asm-powerpc_marker.h
+?_arch_powerpc_kernel_marker.c
+?_arch_powerpc_kernel_Makefile"
 
 for a in $IN; do wr $a $FILE; done
 
@@ -127,6 +147,13 @@ IN="?_include_asm-arm_marker.h
 
 for a in $IN; do wr $a $FILE; done
 
+FILE=../${PRENAME}${COUNT}${NAME}-markers-doc.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_Documentation_marker.txt"
+
+for a in $IN; do wr $a $FILE; done
 
 
 #atomic
@@ -187,7 +214,9 @@ FILE=../${PRENAME}${COUNT}${NAME}-atomic-powerpc.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-powerpc_atomic.h"
+IN="?_include_asm-powerpc_atomic.h
+?_include_asm-powerpc_bitops.h
+?_include_asm-powerpc_system.h"
 
 for a in $IN; do wr $a $FILE; done
 
@@ -200,6 +229,13 @@ IN="?_include_asm-sparc64_atomic.h"
 
 for a in $IN; do wr $a $FILE; done
 
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-s390.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-s390_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
 
 FILE=../${PRENAME}${COUNT}${NAME}-atomic-x86_64.diff
 VALUE=$(( ${VALUE} + 1 ))
@@ -274,8 +310,7 @@ FILE=../${PRENAME}${COUNT}${NAME}-local-powerpc.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-powerpc_local.h
-?_include_asm-powerpc_system.h"
+IN="?_include_asm-powerpc_local.h"
 
 for a in $IN; do wr $a $FILE; done
 
@@ -550,6 +585,79 @@ IN="?_arch_x86_64_ia32_ia32entry.S
 
 for a in $IN; do wr $a $FILE; done
 
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-m68k.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-m68k_thread_info.h"
+
+for a in $IN; do wr $a $FILE; done
+
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-m68knommu.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-m68knommu_thread_info.h
+?_arch_m68knommu_platform_68328_entry.S"
+
+for a in $IN; do wr $a $FILE; done
+
+
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-sparc.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-sparc_thread_info.h
+?_arch_sparc_kernel_entry.S"
+
+for a in $IN; do wr $a $FILE; done
+
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-s390.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_arch_s390_kernel_traps.c
+?_arch_s390_mm_fault.c"
+
+for a in $IN; do wr $a $FILE; done
+
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-sh.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_arch_sh_kernel_entry-common.S
+?_arch_sh_kernel_irq.c
+?_arch_sh_kernel_process.c
+?_arch_sh_kernel_sys_sh.c
+?_arch_sh_kernel_traps.c
+?_arch_sh_mm_fault.c
+?_include_asm-sh_thread_info.h"
+
+for a in $IN; do wr $a $FILE; done
+
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-sh64.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_arch_sh64_kernel_entry.S
+?_include_asm-sh64_thread_info.h"
+
+for a in $IN; do wr $a $FILE; done
+
+#limited
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-alpha.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-alpha_thread_info.h"
+
+for a in $IN; do wr $a $FILE; done
 
 FILE=../${PRENAME}${COUNT}${NAME}-instrumentation.diff
 VALUE=$(( ${VALUE} + 1 ))
@@ -639,6 +747,7 @@ IN="?_include_ltt_ltt-facility-custom-fs_data.h
 ?_include_ltt_ltt-facility-network_ip_interface.h
 ?_include_ltt_ltt-facility-process.h
 ?_include_ltt_ltt-facility-select-default.h
+?_include_ltt_ltt-facility-select-fs.h
 ?_include_ltt_ltt-facility-select-kernel.h
 ?_include_ltt_ltt-facility-select-network_ip_interface.h
 ?_include_ltt_ltt-facility-select-process.h
@@ -738,6 +847,8 @@ IN="?_Makefile
 ?_ltt_Kconfig
 ?_ltt_Makefile
 ?_arch_alpha_Kconfig
+?_arch_arm26_Kconfig
+?_arch_arm_Kconfig
 ?_arch_cris_Kconfig
 ?_arch_frv_Kconfig
 ?_arch_h8300_Kconfig
@@ -749,8 +860,6 @@ IN="?_Makefile
 ?_arch_ppc_Kconfig
 ?_arch_powerpc_Kconfig
 ?_arch_parisc_Kconfig
-?_arch_arm_Kconfig
-?_arch_arm26_Kconfig
 ?_arch_mips_Kconfig
 ?_arch_s390_Kconfig
 ?_arch_sh64_Kconfig