X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=scripts%2Flttng-6-split-script.sh;h=9f3838e477646ecaf0cec74e2ec6882ff1a3ccb8;hb=dedec4bfde1e2c65aaab6938ec9495e5621e449e;hp=bce95e56a2aa990f0d42ee5f202afa1969bf724b;hpb=42c90675a8e1a0ea94fbd1688e910536b31c4d22;p=lttv.git

diff --git a/scripts/lttng-6-split-script.sh b/scripts/lttng-6-split-script.sh
index bce95e56..9f3838e4 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,20 @@ 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="?_arch_powerpc_kernel_prom_parse.c
+?_include_powerpc_prom.h
+?_include_asm-sparc64_tlb.h
+?_kernel_time_clocksource.c
+?_include_asm-ppc_ocp.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
 #for hotplug
 FILE=../${PRENAME}${COUNT}${NAME}-relay.diff
 VALUE=$(( ${VALUE} + 1 ))
@@ -46,27 +60,76 @@ IN="?_include_linux_relay.h
 
 for a in $IN; do wr $a $FILE; done
 
-FILE=../${PRENAME}${COUNT}${NAME}-markers.diff
+#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"
+
+#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_marker.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"
+
+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-ppc_marker.h
 ?_include_asm-s390_marker.h
 ?_include_asm-sh64_marker.h
@@ -80,43 +143,194 @@ IN="?_include_asm-generic_vmlinux.lds.h
 
 for a in $IN; do wr $a $FILE; done
 
-FILE=../${PRENAME}${COUNT}${NAME}-atomic.diff
+
+#atomic
+
+FILE=../${PRENAME}${COUNT}${NAME}-atomic-alpha.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="
-?_include_asm-alpha_atomic.h
-?_include_asm-alpha_system.h
-?_include_asm-generic_atomic.h
-?_include_asm-i386_atomic.h
-?_include_asm-i386_system.h
-?_include_asm-ia64_atomic.h
-?_include_asm-mips_atomic.h
-?_include_asm-mips_system.h
-?_include_asm-parisc_atomic.h
-?_include_asm-powerpc_atomic.h
-?_include_asm-powerpc_system.h
-?_include_asm-sparc64_atomic.h
-?_include_asm-x86_64_atomic.h
-?_include_asm-x86_64_system.h"
+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.diff
+
+FILE=../${PRENAME}${COUNT}${NAME}-local-alpha.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="
-?_include_asm-alpha_local.h
-?_include_asm-generic_local.h
-?_include_asm-i386_local.h
-?_include_asm-ia64_local.h
-?_include_asm-mips_local.h
-?_include_asm-parisc_local.h
-?_include_asm-powerpc_local.h
-?_include_asm-s390_local.h
-?_include_asm-sparc64_local.h
-?_include_asm-x86_64_local.h"
+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-powerpc_local.h
+?_include_asm-powerpc_system.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
 
@@ -360,6 +574,72 @@ 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
+
+
 FILE=../${PRENAME}${COUNT}${NAME}-instrumentation.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
@@ -378,7 +658,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
@@ -394,6 +673,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}
@@ -529,7 +819,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}
 
@@ -537,6 +827,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
@@ -548,8 +840,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