When adding --with-template=feature/rt into configuration line, and compiling kernel, the patch conflicts happened.
Reproduced:
Use CVS checkout source codes.
a)Configuration
#../wrlinux-1.4/wrlinux/configure --enable-board=intel_mpcbl0040 --enable-kernel=cgl --enable-rootfs=glibc_small --with-template=feature/rt --enable-test=yes --enable-build-libc=yes --with-host-tools-dir=/home/ytao/host-tools-1.5/host-tools
b)Make kernel
#make -C build linux
Patch conflicts happened.
If kernel type is cgl, the conflict patches is:
dist/linux/patches/shared/2.6.14/hrtimers/hrtimer_restart.diff
feature/rt/linux/2.6.14/revert-patches/hrt_revert.diff.cgl
dist/linux/patches/shared/2.6.14/leapseconds_fix.patch
feature/rt/linux/2.6.14/cgl-patches/linux_kernel_timer.c
dist/linux/patches/cgl/2.6.14/ipmi/nmi_kgdb_fixes-1.4.patch
feature/rt/linux/2.6.14/cgl-patches/linux-2.6.14_arch_i386_kernel_traps.c
If kernel type is small, the conflict patches is:
feature/rt/linux/2.6.14/revert-patches/hrt_revert.diff.small
dist/linux/patches/shared/2.6.14/hrtimers/hrtimer_restart.diff
feature/rt/linux/2.6.14/small-patches/linux-2.6.14_kernel_timer.c
dist/linux/patches/shared/2.6.14/leapseconds_fix.patch IDENTIFIER = WIND00114919
Patch WIND00114921.zip for 1.4
Patch WIND00114922.zip for 1.5
1. Unzip the patch under [install_dir]/updates
2. Install the patch CD by entering the patch CD directory and run setup_linux.
3. This is a source only patch so you will have to build the kernel
4. Issue a make fs and make the kernel in a configured directory.
5. Upload the kernel and rootfs into the target and boot it up.
