X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=scripts%2Flttng-6-split-script.sh;h=497ee4aa73df0b8c48e783810803586d9476f94e;hb=940d67909cd98bc0e024395398a31529cfd3e6d4;hp=ab01ba51d4bce685bf26985a9cce88d7cbccca12;hpb=0452be202a2028e4cad0c44e99ae7a9575fcb4b0;p=lttv.git

diff --git a/scripts/lttng-6-split-script.sh b/scripts/lttng-6-split-script.sh
index ab01ba51..497ee4aa 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.18-lttng-$1
+NAME=-2.6.20-lttng-$1
 ALL_NAME=${PRENAME}${NAME}-all.diff
 VALUE=1
 printf -v COUNT "%02d" ${VALUE}
@@ -34,14 +34,28 @@ for a in *; do
 	rm $a.tmp;
 done
 
-FILE=../${PRENAME}${COUNT}${NAME}-debugfs.diff
+#hotfix 2.6.20
+FILE=../${PRENAME}${COUNT}${NAME}-hotfix.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_fs_debugfs_inode.c"
+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
+?_arch_sparc64_kernel_process.c
+?_arch_sparc_kernel_process.c
+?_arch_sparc_kernel_traps.c
+?_arch_avr32_kernel_ptrace.c"
+#also in instrumentation
+#?_arch_x86_64_kernel_process.c
+#?_arch_powerpc_kernel_process.c
 
 for a in $IN; do wr $a $FILE; done
 
+
 #for hotplug
 FILE=../${PRENAME}${COUNT}${NAME}-relay.diff
 VALUE=$(( ${VALUE} + 1 ))
@@ -49,32 +63,84 @@ printf -v COUNT "%02d" ${VALUE}
 
 IN="?_include_linux_relay.h
 ?_kernel_relay.c
+?_Documentation_filesystems_relay.txt
 ?_block_blktrace.c"
 
 for a in $IN; do wr $a $FILE; done
 
-FILE=../${PRENAME}${COUNT}${NAME}-markers.diff
+#kprobes
+
+#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
+
+FILE=../${PRENAME}${COUNT}${NAME}-markers-kconfig.part1.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_kernel_Kconfig.marker"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-markers-generic.part1.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
 IN="?_include_asm-generic_vmlinux.lds.h
-?_kernel_Kconfig.marker
 ?_include_linux_module.h
 ?_include_linux_marker.h
-?_include_asm-arm_marker.h
+?_include_linux_kernel.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-markers-i386.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-i386_marker.h
+?_arch_i386_kernel_marker.c
+?_arch_i386_kernel_Makefile"
+
+for a in $IN; do wr $a $FILE; done
+
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-markers-powerpc.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-powerpc_marker.h
+?_arch_powerpc_kernel_marker.c
+?_arch_powerpc_kernel_Makefile"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-markers-non-opt-arch.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-arm_marker.h
 ?_include_asm-cris_marker.h
 ?_include_asm-frv_marker.h
 ?_include_asm-generic_marker.h
 ?_include_asm-h8300_marker.h
-?_include_asm-i386_marker.h
 ?_include_asm-ia64_marker.h
 ?_include_asm-m32r_marker.h
 ?_include_asm-m68k_marker.h
 ?_include_asm-m68knommu_marker.h
 ?_include_asm-mips_marker.h
 ?_include_asm-parisc_marker.h
-?_include_asm-powerpc_marker.h
-?_include_asm-ppc64_marker.h
 ?_include_asm-ppc_marker.h
 ?_include_asm-s390_marker.h
 ?_include_asm-sh64_marker.h
@@ -88,19 +154,201 @@ IN="?_include_asm-generic_vmlinux.lds.h
 
 for a in $IN; do wr $a $FILE; done
 
-FILE=../${PRENAME}${COUNT}${NAME}-atomic_up.diff
+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
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-alpha.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-alpha_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-generic-atomic_long.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-generic_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-i386.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-i386_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-ia64.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-ia64_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-mips.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-mips_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-parisc.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-parisc_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-powerpc.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+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
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-sparc64.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+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 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-x86_64_atomic.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+
+#local
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-generic.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-generic_local.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-alpha.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-alpha_local.h
+?_include_asm-alpha_system.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-i386.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-i386_local.h
+?_include_asm-i386_system.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-ia64.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-ia64_local.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-mips.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-mips_local.h
+?_include_asm-mips_system.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-parisc.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-parisc_local.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-powerpc.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-i386_atomic-up.h
-?_include_asm-i386_system.h
-?_include_asm-x86_64_atomic-up.h
-?_include_asm-x86_64_system.h
-?_include_asm-powerpc_atomic-up.h
-?_include_asm-powerpc_system.h
-?_include_asm-arm_atomic-up.h
-?_include_asm-mips_atomic-up.h
-?_include_asm-generic_atomic-up.h"
+IN="?_include_asm-powerpc_local.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-s390.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-s390_local.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-sparc64.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-sparc64_local.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-x86_64.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_include_asm-x86_64_local.h
+?_include_asm-x86_64_system.h"
+
+
+#facilities
 
 for a in $IN; do wr $a $FILE; done
 
@@ -139,7 +387,8 @@ FILE=../${PRENAME}${COUNT}${NAME}-timestamp.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-alpha_ltt.h
+IN="?_ltt_ltt-test-tsc.c
+?_include_asm-alpha_ltt.h
 ?_include_asm-arm26_ltt.h
 ?_include_asm-arm_ltt.h
 ?_include_asm-cris_ltt.h
@@ -152,7 +401,6 @@ IN="?_include_asm-alpha_ltt.h
 ?_include_asm-m68k_ltt.h
 ?_include_asm-m68knommu_ltt.h
 ?_include_asm-mips_ltt.h
-?_include_asm-mips_mipsregs.h
 ?_include_asm-mips_timex.h
 ?_arch_mips_kernel_time.c
 ?_include_asm-parisc_ltt.h
@@ -285,7 +533,6 @@ printf -v COUNT "%02d" ${VALUE}
 IN="?_arch_mips_kernel_process.c
 ?_arch_mips_kernel_ptrace.c
 ?_arch_mips_kernel_syscall.c
-?_arch_mips_kernel_time.c
 ?_arch_mips_kernel_traps.c
 ?_arch_mips_kernel_unaligned.c
 ?_include_asm-mips_mipsregs.h
@@ -322,8 +569,7 @@ FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-ppc.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_arch_ppc_Kconfig
-?_arch_ppc_kernel_misc.S
+IN="?_arch_ppc_kernel_misc.S
 ?_arch_ppc_kernel_time.c
 ?_arch_ppc_kernel_traps.c
 ?_arch_ppc_mm_fault.c"
@@ -347,6 +593,80 @@ 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 ))
 printf -v COUNT "%02d" ${VALUE}
@@ -365,7 +685,6 @@ IN="?_fs_buffer.c
 ?_kernel_itimer.c
 ?_kernel_kthread.c
 ?_kernel_lockdep.c
-?_kernel_module.c
 ?_kernel_printk.c
 ?_kernel_sched.c
 ?_kernel_signal.c
@@ -381,6 +700,17 @@ IN="?_fs_buffer.c
 
 for a in $IN; do wr $a $FILE; done
 
+
+FILE=../${PRENAME}${COUNT}${NAME}-instrumentation-markers.tosplit.diff
+VALUE=$(( ${VALUE} + 1 ))
+printf -v COUNT "%02d" ${VALUE}
+
+IN="?_kernel_module.c"
+
+for a in $IN; do wr $a $FILE; done
+
+
+
 FILE=../${PRENAME}${COUNT}${NAME}-facilities-probes-headers.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
@@ -425,10 +755,12 @@ 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
 ?_include_ltt_ltt-facility-select-statedump.h
+?_include_ltt_ltt-facility-select-compact.h
 ?_include_ltt_ltt-facility-socket.h
 ?_include_ltt_ltt-facility-stack.h
 ?_include_ltt_ltt-facility-statedump.h
@@ -516,7 +848,7 @@ IN="?_ltt_ltt-statedump.c"
 for a in $IN; do wr $a $FILE; done
 
 
-FILE=../${PRENAME}${COUNT}${NAME}-build.diff
+FILE=../${PRENAME}${COUNT}${NAME}-build.tosplit.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
@@ -524,6 +856,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
@@ -535,8 +869,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