いろいろ記録しておこう。
備忘録$ cd ~/bk/linuxppc_2_4_devel $ bk export -tpatch -rv2.4.18,v2.4.19-pre1 > ../diff2419p1 $ bk export -tpatch -rv2.4.19-pre1,v2.4.19-pre2 > ../diff2419p2 $ bk export -tpatch -rv2.4.19-pre2,v2.4.19-pre3 > ../diff2419p3 $ bk export -tpatch -rv2.4.19-pre3,v2.4.19-pre4 > ../diff2419p4 $ cd $ cvs -d /cvsroot export -ko -r LINUX_2_4_18 linux $ cd linux $ cat ~/bk/diff2419p1 | patch -p1 $ cvs -d /cvsroot -q import -m 'linux-2.4.19-pre1' linux LINUX_KERNEL LINUX_2_4_19_PRE1 $ cat ~/bk/diff2419p2 | patch -p1 $ cvs -d /cvsroot -q import -m 'linux-2.4.19-pre2' linux LINUX_KERNEL LINUX_2_4_19_PRE2 $ cat ~/bk/diff2419p3 | patch -p1 $ cvs -d /cvsroot -q import -m 'linux-2.4.19-pre3' linux LINUX_KERNEL LINUX_2_4_19_PRE3 $ cat ~/bk/diff2419p4 | patch -p1 $ cvs -d /cvsroot -q import -m 'linux-2.4.19-pre4' linux LINUX_KERNEL LINUX_2_4_19_PRE4 $ cd .. $ rm -rf linux $ cvs -d /cvsroot rtag -b -r LINUX_2_4_19_PRE4 OBS_2_4_19_PRE4 linux $ cvs -d /cvsroot checkout -ko -r OBS_2_4_19_PRE4 linux
static void dump_tlb(void) { unsigned int ctr, ctr_org; unsigned int index; int i; /* save ctr */ ctr_org = mfspr(792); printk ("md_ctr %08x original\n", ctr_org); for (i = 0; i < 32; i++) { ctr = mfspr(792); index = (ctr & 0xffff0000) | (i << 8); mtspr(792, index); /* update cam */ mtspr(824, 0); printk ("md_ctr %08x ", mfspr(792)); printk ("cam %08x ", mfspr(824)); printk ("ram0 %08x ", mfspr(825)); printk ("ram1 %08x\n", mfspr(826)); } /* restore ctr */ mtspr(792, ctr_org); }
linux-2.4.19-pre7 でやっと linux/include/asm-ppc/pgtable.h に変更が入った。$ cvs -d /cvsroot rtag -b -r LINUX_2_4_19_PRE7 BRANCH_2_4_19_PRE7 linux $ cd linux $ cvs update -ko -r BRANCH_2_4_19_PRE7 $ bzcat ~/patch-2.4.19-pre4-20020417wip.bz2 | patch -p1 patching file Makefile patching file arch/ppc/config.in patching file arch/ppc/8xx_io/enet.c patching file arch/ppc/8xx_io/fec.c patching file arch/ppc/8xx_io/uart.c Hunk #2 succeeded at 159 (offset -1 lines). patching file arch/ppc/boot/common/util.S patching file arch/ppc/boot/simple/Makefile patching file arch/ppc/boot/simple/embed_config.c patching file arch/ppc/boot/simple/m8xx_tty.c patching file arch/ppc/configs/obs_defconfig patching file arch/ppc/kernel/obsled.c patching file drivers/ide/ide-m8xx.c patching file drivers/net/setup.c patching file include/asm-ppc/commproc.h patching file include/asm-ppc/ide.h patching file include/asm-ppc/mpc8xx.h patching file include/asm-ppc/obs.h patching file include/asm-ppc/pgtable.h Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file include/asm-ppc/pgtable.h.rej patching file include/asm-ppc/ppcboot.h $
linux な TAG がついている ChangeSet は全く linus kernel と同じ。 これを追いかけてもいまいちしょうがないみたい。ChangeSet 1.xxx が 開発ヘッドなわけ。_ bk clean: で掃除ができる。
_ bk get: で read-only mode でファイルが取り出せる。
_ bk edit: で read-write mode でファイルが取り出せる。
覚え書き。これでサブディレクトリも掃除する。#! /bin/sh CMD="bk clean" bkclean () { clean_done=0 for i in `/bin/ls`; do if [ -d $i ] && [ "$i" != "SCCS" ] && [ "$i" != "BitKeeper" ]; then cd $i bkclean cd .. else if [ x"$clean_done" = x"0" ]; then /bin/pwd $CMD clean_done=1 fi fi done } bkclean