リソース†
git repo†
Google drive†
Files†
- v1.4 update 反映版(22.04 と 20.04 で out の挙動違う。out 最終行のページ跨ぎで全白問題は残っている)
- 作業再開時(2023.11) の upstream EU 差分確認用(0e1115c[20230318] → 193fe86[202309])、22.04 は白 飛びなので 20.04 版
プリンシプル†
- LFS301
- EN final [on master] = v8.0
- JP final [on japanese] = (based on EN )
- LFS307
- LFS303
- 301 master(latest) と 307 master(latest) の比較
プロセス†
LFS301 コンパイルエラー†
- common の最新版を使ってリビルドを試みたがエラーになった
- Makefile のリンク先を common/Makefile_oneclass から common/Makefile_oneclass_JAPANESE に変更したら解決した
- JP 専用 Makefile には xelatex を使用する指示が入っているなど JP 版ビルド用に修正が入っていた
- 上記で Makefile を単純に以前使った日本語専用に先祖帰りさせたが、これだと common 側の更新が反映されない → 後々 COVER のビルドで問題が出た
- 301 時点での 「共用 Makefile」 と 「日本語専用 Makefile」の差分をみて、それを最新の common の Makefile に反映したものを、新日本語専用にする必要がある
LFS307-JP の作成†
make でエラー
- Makefile は LFS301-JP では日本語専用のものを使っていたが、307 では共通のものを利用することにした。
- 日本語は xetex で生成するという記述が共通版最新に反映されていた
- その他の Makefile の更新が非常に多いのでバックポートは不可能と判断
- 日本語が含まれるファイルが ASCII 形式だったのを UTF-8 に変換
munakata@muna-Linux:~/LFS/LFS307-JP$ file LFS307-JP.tex
LFS307-JP.tex: LaTeX 2e document, ASCII text, with escape sequences
munakata@muna-Linux:~/LFS/LFS307-JP$ nkf -w --overwrite LFS307-JP.tex
munakata@muna-Linux:~/LFS/LFS307-JP$ file LFS307-JP.tex
LFS307-JP.tex: LaTeX 2e document, Unicode text, UTF-8 text
- この段階で前英語テキストの状態で Make して pdf が出来ることを確認(一部のキャプションが日本語になった)
カバーレター(表紙など)の日本語が表示されなかったので make clean して再ビルドしたら エラーになった
- Makefile を共通の最新に変更したら、make clean からのフルブルドでもエラーはなくなった。
introduction の反映†
- 上記で diff で差が出ないのは怪しい。DeepL の翻訳と比較するといくつかのファイルで更新の痕跡が見られる。
- 自己レス:差がないのは 301時点で introduction の内容が更新されていたから。301-JP にはこの更新後の内容が反映されていなかった。
- LFS301 の introduction が本当にローカルを参照しているのか(まぁローカルにファイルはあるわけだが)確認が必要。
- 一方で common の introduction の変更履歴は以下のようになっていて、最近更新されたファイルは差分を確認する必要がある。
| file | last change | used in 307 |
| change.tex | 9 months ago | yes |
| courses.tex | last year | no |
| distro.inc | last year | yes |
| distro.tex | 2 years ago | yes |
| documentation.tex | 2 years ago | no |
| index.tex | 6 months ago | - |
| legalcrap.tex | 9 months ago | no |
| nodistro.tex | 5 months ago | yes |
| platform.tex | 4 years ago | no |
| readyfor.tex | 2 years ago | no |
| register.tex | 4 years ago | no |
| virtualmachine.tex | 7 months ago | no |
| whoweare.tex | 2 years ago | no |
| whoyouare.tex | 2 years ago | no |
- LFS301 配下の introduction ファイルと、最新の common/LFS_introduction のファイルには差がなかった。
- 301時代の終盤(LFS301_ というファイルに変わったあたり)で introduction のファイルが変更されている可能性もある。
munakata@muna-Linux:~/LFS/LFS301$ diff CHAPS/LFS301_introduction/lf.tex ../common/LFS_introduction/lf.tex
munakata@muna-Linux:~/LFS/LFS301$ diff CHAPS/LFS301_introduction/training.tex ../common/LFS_introduction/training.tex
- 301 時代から common の introduction を参照しているので、差がないのは当たり前だった。
0 lrwxrwxrwx 1 munakata munakata 26 4月 5 15:26 LFS301_introduction -> ../common/LFS_introduction
- では何時変更がはいったのか? ⇒ 忘れたが 301-JP の intro 和訳はもらった気がするので、その時点でずれていたのか?
- 301-JP の introduction 日本語訳には以下のコメントがある。 誰か別の人が以前のソースを自動翻訳した痕跡であるのは明らかだ。
% This file was generated with po4a. Translate the source file.%
- 301/307 と 301-JP/307-JP の introduction の差分
|common/LFS_introduction の構成 | LFS301-JP (=307JP 現状) | 更新があるか
| input{lf} | ← | updated |
| input{training} | ← | updated |
| input{certification} | ← | Updated |
| input{badging} | ← | Updated |
| input{exercises} | ← | Identical |
| input{change} | ← | New |
| input{elearning} | ← | Identical |
| input{distributions} | ← | Updated |
| input{labs} | ← | Updated |
- 何れにしても変更はマイナーなので、対象ファイルを個別に調査して反映することにする(2023/04/06)
Closing の反映†
- こちらはファイルが1つ(それも柴田さんから提供してもらった、日本語コースの共通ファイル)なので、それをそのまま利用する
- 元々の common からのリンクは切って、別にローカルファイルを置いた。
Identical なファイルのコピー†
- 基本は問題なし
- labs で2つ include ファイルが無いというエラーが出た。
- 何故 identical だと判定されたか(labs.tex について)調査が必要だろう
git operation†
munakata@muna-Linux:~/LFS/LFS307-JP$ git branch -a
* japanese-wip
remotes/origin/HEAD -> origin/master
remotes/origin/coop
remotes/origin/lee
remotes/origin/lee2022
remotes/origin/master
remotes/origin/staging
munakata@muna-Linux:~/LFS/LFS307-JP$ git remote -v
origin https://github.com/lftraining/LFS307 (fetch)
origin https://github.com/lftraining/LFS307 (push)
munakata@muna-Linux:~/LFS/LFS307-JP$ git push origin japanese-wip
Username for 'https://github.com': hmunak
Password for 'https://hmunak@github.com':
Enumerating objects: 230, done.
Counting objects: 100% (230/230), done.
Delta compression using up to 8 threads
Compressing objects: 100% (144/144), done.
Writing objects: 100% (146/146), 114.37 KiB | 7.62 MiB/s, done.
Total 146 (delta 42), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (42/42), completed with 16 local objects.
To https://github.com/lftraining/LFS307
0e1115c..0e632bc japanese-wip -> japanese-wip
xelatex / tcolorboxes (out) issues†
v3 to v4 diffs†
munakata@muna-Linux:~/LFJ/LFS307-JP$ git diff 0e11 940b --name-only --diff-filter=M | grep CHAPS ( 37 files modified)
* CHAPS/apt/apt.tex
* CHAPS/containers/basics.tex [#c34b91e3]
* CHAPS/containers/docker.tex [#c758086a]
* CHAPS/containers/index.tex [#f07654cf]
* CHAPS/containers/labs.tex [#b107dfee]
* CHAPS/firewall/interfaces.tex
* CHAPS/firewall/nat.tex
* CHAPS/firewall/zones.tex
* CHAPS/fsfeatures/mount.tex
* CHAPS/fslayout/home.tex
* CHAPS/fslayout/media.tex
* CHAPS/groups/group.tex
* CHAPS/init/index.tex [#cea34c21]
* CHAPS/init/init.tex [#xfb61fb8]
* CHAPS/init/labs.tex [#g5a7f8d8]
* CHAPS/init/systemd.tex [#yc01ac73]
* CHAPS/kernel-udev/labs.tex
* CHAPS/kernel-udev/udev.tex
* CHAPS/memmon/memmon.tex
* CHAPS/netbasics/addresses.tex
* CHAPS/netconfig/bonding.tex [#d375f77f]
* CHAPS/netconfig/configfiles.tex [#t566b61b]
* CHAPS/netconfig/diagnostics.tex [#z8268b78]
* CHAPS/netconfig/dns.tex [#n780b8ba]
* CHAPS/netconfig/index.tex [#q4a99887]
* CHAPS/netconfig/interfaces.tex [#l64ded57]
* CHAPS/netconfig/labs.tex [#jdb8f7c1]
* CHAPS/netconfig/networkmanager.tex [#r8b438c4]
* CHAPS/netconfig/routing.tex [#j7dc0636]
* CHAPS/processes/future.tex
* CHAPS/user-environment/index.tex
* CHAPS/user-environment/labs.tex
* CHAPS/users/accounts.tex
* CHAPS/users/labs.tex
* CHAPS/users/passwords.tex
* CHAPS/users/ssh.tex
* CHAPS/vfs/avail.tex
munakata@muna-Linux:~/LFJ/LFS307-JP$ git diff 0e11 940b --name-only --diff-filter=A | grep CHAPS (11 files added)
* CHAPS/containers/cowsay.tex [#of079b72]
* CHAPS/containers/docker-compose.tex [#t8bcac82]
* CHAPS/containers/reprobuild-1024.png [#i94d4f3d]
* CHAPS/containers/reprobuild.tex [#a2d5e24c]
* CHAPS/git-started/commands.tex [#h7e09bfe]
* CHAPS/git-started/example.tex [#fe05643c]
* CHAPS/git-started/getsources.tex [#r59a1283]
* CHAPS/git-started/index.tex [#fcffd3a3]
* CHAPS/git-started/lab.tex [#w9c8adb8]
* CHAPS/git-started/revision.tex [#o9ead616]
* CHAPS/init/dbus.service.inc [#x6209a6d]
munakata@muna-Linux:~/LFJ/LFS307-JP$ git diff 0e11 940b --name-only --diff-filter=D | grep CHAPS (26 files deleted)
* CHAPS/GIT_EXAMPLE/commands.tex [#e09de738]
* CHAPS/GIT_EXAMPLE/example.tex [#k85cb4cf]
* CHAPS/GIT_EXAMPLE/index.tex [#tbb44fef]
* CHAPS/GIT_EXAMPLE/lab.tex [#p4777265]
* CHAPS/GIT_EXAMPLE/labs/lab_gitexample.sh [#c146d0c6]
* CHAPS/GIT_EXAMPLE/mastermain.tex [#q05063b0]
* CHAPS/GIT_EXAMPLE/signoff.tex [#va7c2d4a]
* CHAPS/GIT_INTRO/available.tex [#e877e817]
* CHAPS/GIT_INTRO/dco.tex [#hf8ebfa3]
* CHAPS/GIT_INTRO/distrib.tex [#h0fd1a33]
* CHAPS/GIT_INTRO/documentation.tex [#b3c4199a]
* CHAPS/GIT_INTRO/git.tex [#aee1026b]
* CHAPS/GIT_INTRO/graphics.tex [#a34de45a]
* CHAPS/GIT_INTRO/guitable.inc [#y6a62d41]
* CHAPS/GIT_INTRO/index.tex [#yfb9e41b]
* CHAPS/GIT_INTRO/lab.tex [#yb88e34c]
* CHAPS/GIT_INTRO/revision.tex [#fa9ce830]
* CHAPS/GIT_INTRO/revtable.inc [#jac3ca94]
* CHAPS/containers/U20-04-podman.inc [#ke96ab4a]
* CHAPS/containers/labs-docker.inc [#g55a0fb7]
* CHAPS/containers/labs/LFS-class.conf [#o46a49d4]
* CHAPS/containers/labs/Ubuntu-20.04-podman-repo.sh [#ne5435da]
* CHAPS/containers/podman.tex [#sf7cf881]
* CHAPS/init/labs/fake2.service [#da74ce46]
* CHAPS/netconfig/ipifconfig.tex [#m3690f2b]
* CHAPS/user-environment/keys.tex
作業再開時の確認†
- 柴田さんは、当初 LFS307(upstream) の 7/27 時点を sync していた
- に柴田さんに 0e1115c まで反映済と回答
- &ref(): File not found: "" at page "ShibataProjects2";
- 8/26 に sync 済分まで(=7/27 まで)の差分を反映 したことを報告済(下記の線を入れた部分までは反映すみ)
- その時点で Upstream 側には 11個の追加コミットがあった
Upstream updates catchup (0e1115c[20230318] → 193fe86[20230919])†
- 9e52aa4[20230512]
- CHAPS/netconfig/bonding.tex
- CHAPS/netconfig/configfiles.tex
- CHAPS/netconfig/diagnostics.tex
- CHAPS/netconfig/dns.tex
- CHAPS/netconfig/index.tex
- CHAPS/netconfig/interfaces.tex
- CHAPS/netconfig/ipifconfig.tex (deleted)
- CHAPS/netconfig/labs.tex (deleted)
- CHAPS/netconfig/routing.tex
- 96dc423[20230518]
- CHAPS/init/dbus.service.inc
- CHAPS/init/index.tex
- CHAPS/init/init.tex
- CHAPS/init/labs.tex
- CHAPS/init/labs/fake2.service (deleted)
- CHAPS/init/systemd.tex
- 973f7b3[20230519]
- CHAPS/netconfig/bonding.tex
- CHAPS/netconfig/diagnostics.tex
- CHAPS/netconfig/networkmanager.tex
- 6a9d865[20230524-1] merge pull request
- CHAPS/netconfig/bonding.tex
- CHAPS/netconfig/configfiles.tex
- CHAPS/netconfig/diagnostics.tex
- CHAPS/netconfig/dns.tex
- CHAPS/netconfig/index.tex
- CHAPS/netconfig/interfaces.tex
- CHAPS/netconfig/ipifconfig.tex (deleted)
- CHAPS/netconfig/labs.tex (deleted)
- CHAPS/netconfig/networkmanager.tex
- CHAPS/netconfig/routing.tex
- 029d9f6[20230524-2] merge pull request
- CHAPS/init/dbus.service.inc
- CHAPS/init/index.tex
- CHAPS/init/init.tex
- CHAPS/init/labs.tex
- CHAPS/init/labs/fake2.service (deleted)
- CHAPS/init/systemd.tex
- e7e38b5[20230524-3]
- CHAPS/fsfeatures/mount.tex
- CHAPS/vfs/avail.tex
- d84f094[20230524-4]
- .gitignore
- 73c8378[20230606]
- CHAPS/groups/group.tex
- CHAPS/user-environment/index.tex
- CHAPS/user-environment/keys.tex (deleted)
- CHAPS/user-environment/labs.tex
- CHAPS/users/accounts.tex
- CHAPS/users/labs.tex
- CHAPS/users/passwords.tex
- CHAPS/users/ssh.tex
- d8d27c5[20230607] merge pull request
- .gitignore
- f041d4e[20230609]
- CHAPS/GIT_EXAMPLE/commands.tex (deleted)
- CHAPS/GIT_EXAMPLE/example.tex (deleted)
- CHAPS/GIT_EXAMPLE/index.tex (deleted)
- CHAPS/GIT_EXAMPLE/lab.tex (deleted)
- CHAPS/GIT_EXAMPLE/labs/lab_gitexample.sh (deleted)
- CHAPS/GIT_EXAMPLE/mastermain.tex (deleted)
- CHAPS/GIT_EXAMPLE/signoff.tex (deleted)
- CHAPS/GIT_INTRO/available.tex (deleted)
- CHAPS/GIT_INTRO/dco.tex (deleted)
- CHAPS/GIT_INTRO/distrib.tex (deleted)
- CHAPS/GIT_INTRO/documentation.tex (deleted)
- CHAPS/GIT_INTRO/git.tex (deleted)
- CHAPS/GIT_INTRO/graphics.tex (deleted)
- CHAPS/GIT_INTRO/guitable.inc (deleted)
- CHAPS/GIT_INTRO/index.tex (deleted)
- CHAPS/GIT_INTRO/lab.tex (deleted)
- CHAPS/GIT_INTRO/revision.tex (deleted)
- CHAPS/GIT_INTRO/revtable.inc (deleted)
- CHAPS/git-started/commands.tex
- CHAPS/git-started/example.tex
- CHAPS/git-started/getsources.tex
- CHAPS/git-started/index.tex
- CHAPS/git-started/revision.tex
- IMAGES/icon-lfmore.png (invalid image source)
- LFS207.tex
- LFS307.tex
- 69c6971[20230610-1] <v1.4>
- LFS207.tex
- LFS307.tex
- 4e7d42a[20230610-2]
- CHAPS/containers/U20-04-podman.inc (deleted)
- CHAPS/containers/basics.tex
- CHAPS/containers/compose-kuma.output
- CHAPS/containers/cowsay.Dockerfile
- CHAPS/containers/docker-compose.tex
- CHAPS/containers/docker.tex
- CHAPS/containers/index.tex
- CHAPS/containers/labs.tex (deleted)
- CHAPS/containers/podman.tex (deleted)
- 89f0c59[20230620-1] merge pull request
- CHAPS/fsfeatures/mount.tex
- CHAPS/vfs/avail.tex
- c645d54[20230620-2] merge pull request
- CHAPS/groups/group.tex
- CHAPS/user-environment/index.tex
- CHAPS/user-environment/keys.tex (deleted)
- CHAPS/user-environment/labs.tex
- CHAPS/users/accounts.tex
- CHAPS/users/labs.tex
- CHAPS/users/passwords.tex
- CHAPS/users/ssh.tex
- 3ff8fc1[20230620-3] merge pull request
- CHAPS/containers/U20-04-podman.inc (deleted)
- CHAPS/containers/basics.tex
- CHAPS/containers/compose-kuma.output
- CHAPS/containers/cowsay.Dockerfile
- CHAPS/containers/docker-compose.tex
- CHAPS/containers/docker.tex
- CHAPS/containers/index.tex
- CHAPS/containers/labs.tex (deleted)
- CHAPS/containers/podman.tex (deleted)
- a4d298e[20230620-4] merge pull request
- CHAPS/GIT_EXAMPLE/commands.tex (deleted)
- CHAPS/GIT_EXAMPLE/example.tex (deleted)
- CHAPS/GIT_EXAMPLE/index.tex (deleted)
- CHAPS/GIT_EXAMPLE/lab.tex (deleted)
- CHAPS/GIT_EXAMPLE/labs/lab_gitexample.sh (deleted)
- CHAPS/GIT_EXAMPLE/mastermain.tex (deleted)
- CHAPS/GIT_EXAMPLE/signoff.tex (deleted)
- CHAPS/GIT_INTRO/available.tex (deleted)
- CHAPS/GIT_INTRO/dco.tex (deleted)
- CHAPS/GIT_INTRO/distrib.tex (deleted)
- CHAPS/GIT_INTRO/documentation.tex (deleted)
- CHAPS/GIT_INTRO/git.tex (deleted)
- CHAPS/GIT_INTRO/graphics.tex (deleted)
- CHAPS/GIT_INTRO/guitable.inc (deleted)
- CHAPS/GIT_INTRO/index.tex (deleted)
- CHAPS/GIT_INTRO/lab.tex (deleted)
- CHAPS/GIT_INTRO/revision.tex (deleted)
- CHAPS/GIT_INTRO/revtable.inc (deleted)
- CHAPS/git-started/commands.tex
- CHAPS/git-started/example.tex
- CHAPS/git-started/getsources.tex
- CHAPS/git-started/index.tex
- CHAPS/git-started/revision.tex
- IMAGES/icon-lfmore.png (invalid image source)
- LFS207.tex
- LFS307.tex
- 0fdbe74[20230620-5] merge pull request <1.4>
- LFS207.tex
- LFS307.tex
- 9152319[20230621-1]
- CHAPS/apt/apt.tex
- CHAPS/firewall/interfaces.tex
- CHAPS/firewall/nat.tex
- CHAPS/firewall/zones.tex
- CHAPS/fslayout/home.tex
- CHAPS/fslayout/media.tex
- CHAPS/git-started/revision.tex
- CHAPS/init/index.tex
- CHAPS/kernel-udev/labs.tex
- CHAPS/kernel-udev/udev.tex
- CHAPS/netbasics/addresses.tex
- CHAPS/processes/future.tex
- LFS207.tex (submodule related)
- LFS307.tex (submodule related)
- 64b2865[20230621-2]
- CHAPS/git-started/index.tex
- CHAPS/git-started/lab.tex
- ababae3[20230621-3] merge pull request
- CHAPS/apt/apt.tex
- CHAPS/firewall/interfaces.tex
- CHAPS/firewall/nat.tex
- CHAPS/firewall/zones.tex
- CHAPS/fslayout/home.tex
- CHAPS/fslayout/media.tex
- CHAPS/git-started/revision.tex
- CHAPS/init/index.tex
- CHAPS/kernel-udev/labs.tex
- CHAPS/kernel-udev/udev.tex
- CHAPS/netbasics/addresses.tex
- CHAPS/processes/future.tex
- LFS207.tex
- LFS307.tex
- 8abb4e1[20230621-4] merge pull request
- CHAPS/git-started/index.tex
- CHAPS/git-started/lab.tex
- abbc92f[20230621-5]
- IMAGES/icon-lfmore.png (invalid image source)
- e34e1c8[20230621-6] (submodule application)
- common (deleted)
- 112c1d5[20230621-7]
- CHAPS/memmon/meminfo.output (rename, no change)
- CHAPS/memmon/memmon.tex
- 8f42ebc[20230621-8]
- CHAPS/firewall/interfaces.tex
- LFS307.tex
- lf-custom.tex
- 333d534[20230621-9]
- .gitignore
- 67f3084[20230621-10]
- SOLUTIONS/LICENSE
- 8d5afb6[20230621-11] (submodule application)
- .gitmodules
- README.md
- common
- e97b764[20230624] ---> Applied
- .devcontainer/.dockerignore
- .devcontainer/Dockerfile
- .devcontainer/README.md
- .devcontainer/devcontainer.json
- .devcontainer/docker-compose.yml
- 4401884[20230626]
- CHAPS/containers/compose-kuma.output (deleted)
- CHAPS/containers/cowsay.Dockerfile (deleted)
- CHAPS/containers/cowsay.tex
- CHAPS/containers/docker-compose.tex
- CHAPS/containers/docker.tex
- CHAPS/containers/index.tex
- CHAPS/containers/labs-docker.inc (deleted)
- CHAPS/containers/labs.tex (deleted)
- CHAPS/containers/labs/LFS-class.conf (deleted)
- CHAPS/containers/labs/Ubuntu-20.04-podman-repo.sh (deleted)
- CHAPS/containers/labs/Ubuntu-20.04-podman-repo.sh
- CHAPS/containers/reprobuild-1024.png
- CHAPS/containers/reprobuild.tex
- c5f3790[20230627] merge pull request
- CHAPS/containers/compose-kuma.output (deleted)
- CHAPS/containers/cowsay.Dockerfile (deleted)
- CHAPS/containers/cowsay.tex
- CHAPS/containers/docker-compose.tex
- CHAPS/containers/docker.tex
- CHAPS/containers/index.tex
- CHAPS/containers/labs-docker.inc (deleted)
- CHAPS/containers/labs.tex (deleted)
- CHAPS/containers/labs/LFS-class.conf (deleted)
- CHAPS/containers/labs/Ubuntu-20.04-podman-repo.sh (deleted)
- CHAPS/containers/reprobuild-1024.png
- CHAPS/containers/reprobuild.tex
- 8311611[20230630-1]
- LFS207 (deleted)
- LFS207.tex
- LFS307.tex
- lf-custom.tex
- 940bf73[20230630-2]
- README.md
- 1165957[20230823-1] ---> Applied
- DOMAINS/Maintainers_Meeting_11_March_2022.pdf
- f5e6f2f[20230823-2] ---> Applied
- .devcontainer/Dockerfile
- .devcontainer/devcontainer.json
- 1e876ce[20230823-3] ---> Applied
- BINARIES/.empty_dir
- c01404e[20230823-4] ---> Ignored
- common (submodule)
- c504ace[20230824-1] ---> Ignored
- common (submodule)
- 85c9002[20230824-2] ---> Ignored
- CHAPS/closing
- CHAPS/introduction
- dd8c233[20230825-1] (readme.md) ---> Applied
- README.md
- dea044d[20230825-2] (readme.md) ---> Applied
- README.md
- 5102b4d[20230825-3] ---> Ignored
- common (submodule)
- f9187fe[20230825-4] (readme.md) ---> Applied
- README.md
- 0034f08[20230825-5] (readme.md) ---> Applied
- README.md
- 96a74cf[20230914]---> Ignored
- LFS307.tex
- 193fe86[20230919]
- CHAPS/ldap/labs.tex ---> Applied