diary/Nagura/2014-08-04
の編集
http://sv5.linet.gr.jp/index.php?diary/Nagura/2014-08-04
[
トップ
] [
編集
|
差分
|
バックアップ
|
添付
|
リロード
] [
新規
|
一覧
|
検索
|
最終更新
|
ヘルプ
|
ログイン
]
-- 雛形とするページ --
diary/Template
[[diary/Nagura]] 609日 ・linux-2.16 at unicon Plamo-5.2 x86 linux-2.16がリリースされたので念のためコンソールの日本語表示を再確認した。~ ~ 今度はパッチのあたり具合をしっかり記録~ # patch -p1 < ../vd_unicon-kernel-20140609-3.15.0.patch~ patching file drivers/tty/vt/consolemap.c~ patching file drivers/tty/vt/selection.c~ patching file drivers/tty/vt/vt.c~ Hunk #19 succeeded at 2023 (offset 71 lines).~ Hunk #20 succeeded at 2289 (offset 71 lines).~ Hunk #21 succeeded at 2309 (offset 71 lines).~ Hunk #22 succeeded at 2498 (offset 71 lines).~ Hunk #23 succeeded at 2609 (offset 71 lines).~ Hunk #24 succeeded at 2774 (offset 71 lines).~ Hunk #25 succeeded at 3173 (offset 71 lines).~ Hunk #26 succeeded at 4431 (offset 75 lines).~ Hunk #27 succeeded at 4462 (offset 75 lines).~ The next patch would create the file drivers/tty/vt/vt.c.orig,~ which already exists! Assume -R? [n]~ Apply anyway? [n]~ Skipping patch.~ 1 out of 1 hunk ignored~ patching file drivers/video/Kconfig~ patching file drivers/video/Makefile~ patching file drivers/video/console/bitblit.c~ patching file drivers/video/console/fbcon.c~ Hunk #4 succeeded at 982 (offset 1 line).~ Hunk #5 succeeded at 1294 (offset 1 line).~ Hunk #6 succeeded at 1314 (offset 1 line).~ Hunk #7 succeeded at 1617 (offset 1 line).~ Hunk #8 succeeded at 1637 (offset 1 line).~ Hunk #9 succeeded at 1766 (offset 1 line).~ Hunk #10 succeeded at 1784 (offset 1 line).~ Hunk #11 succeeded at 1800 (offset 1 line).~ Hunk #12 succeeded at 1832 (offset 1 line).~ Hunk #13 succeeded at 1957 (offset 1 line).~ Hunk #14 succeeded at 2055 (offset 1 line).~ Hunk #15 succeeded at 2763 (offset 1 line).~ Hunk #16 succeeded at 2884 (offset 1 line).~ Hunk #17 succeeded at 3746 (offset 1 line).~ The next patch would create the file drivers/video/console/fbcon.c.orig,~ which already exists! Assume -R? [n]~ Apply anyway? [n]~ Skipping patch.~ 1 out of 1 hunk ignored~ patching file drivers/video/console/unicon.c~ 以下はエラーがないので省略。~ ~ どおりで*.rejファイルはさがせなかった。~ ~ tty/vt/vt.c~ video/console/fbcon.c~ のようすは明日確認しよう。 #comment
タイムスタンプを変更しない
[[diary/Nagura]] 609日 ・linux-2.16 at unicon Plamo-5.2 x86 linux-2.16がリリースされたので念のためコンソールの日本語表示を再確認した。~ ~ 今度はパッチのあたり具合をしっかり記録~ # patch -p1 < ../vd_unicon-kernel-20140609-3.15.0.patch~ patching file drivers/tty/vt/consolemap.c~ patching file drivers/tty/vt/selection.c~ patching file drivers/tty/vt/vt.c~ Hunk #19 succeeded at 2023 (offset 71 lines).~ Hunk #20 succeeded at 2289 (offset 71 lines).~ Hunk #21 succeeded at 2309 (offset 71 lines).~ Hunk #22 succeeded at 2498 (offset 71 lines).~ Hunk #23 succeeded at 2609 (offset 71 lines).~ Hunk #24 succeeded at 2774 (offset 71 lines).~ Hunk #25 succeeded at 3173 (offset 71 lines).~ Hunk #26 succeeded at 4431 (offset 75 lines).~ Hunk #27 succeeded at 4462 (offset 75 lines).~ The next patch would create the file drivers/tty/vt/vt.c.orig,~ which already exists! Assume -R? [n]~ Apply anyway? [n]~ Skipping patch.~ 1 out of 1 hunk ignored~ patching file drivers/video/Kconfig~ patching file drivers/video/Makefile~ patching file drivers/video/console/bitblit.c~ patching file drivers/video/console/fbcon.c~ Hunk #4 succeeded at 982 (offset 1 line).~ Hunk #5 succeeded at 1294 (offset 1 line).~ Hunk #6 succeeded at 1314 (offset 1 line).~ Hunk #7 succeeded at 1617 (offset 1 line).~ Hunk #8 succeeded at 1637 (offset 1 line).~ Hunk #9 succeeded at 1766 (offset 1 line).~ Hunk #10 succeeded at 1784 (offset 1 line).~ Hunk #11 succeeded at 1800 (offset 1 line).~ Hunk #12 succeeded at 1832 (offset 1 line).~ Hunk #13 succeeded at 1957 (offset 1 line).~ Hunk #14 succeeded at 2055 (offset 1 line).~ Hunk #15 succeeded at 2763 (offset 1 line).~ Hunk #16 succeeded at 2884 (offset 1 line).~ Hunk #17 succeeded at 3746 (offset 1 line).~ The next patch would create the file drivers/video/console/fbcon.c.orig,~ which already exists! Assume -R? [n]~ Apply anyway? [n]~ Skipping patch.~ 1 out of 1 hunk ignored~ patching file drivers/video/console/unicon.c~ 以下はエラーがないので省略。~ ~ どおりで*.rejファイルはさがせなかった。~ ~ tty/vt/vt.c~ video/console/fbcon.c~ のようすは明日確認しよう。 #comment
テキスト整形のルールを表示する