• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxobjective-cc#cocoa誰得qtrubygamebathyscaphephpgui翻訳windowspythoncomegattwittertestframeworkbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

Commit MetaInfo

Revisioned2cdda023a45d7dbd64d1d07b1a7a205f64e991 (tree)
Time2017-05-20 11:45:10
Authormatsuand <matsuand@user...>
Commitermatsuand

Log Message

GIT-20170519.

Change Summary

Incremental Difference

--- a/BLFS/SVN/Makefile
+++ b/BLFS/SVN/Makefile
@@ -1,6 +1,3 @@
11 all:
2+ mkdir -p builddir
23 cd builddir && make
3-
4-distclean:
5- cd builddir && make $@
6- cd builddir && rm -fr ctie && rm -fr src
--- a/CLFSja/clfs-3.0.0-systemd/myconf.sh
+++ b/CLFSja/clfs-3.0.0-systemd/myconf.sh
@@ -9,8 +9,12 @@ ARCHS := x86 x86_64 x86_64-64 \
99
1010 all:
1111 make -C builddir
12+nochunks:
13+ make -C builddir/src nochunks
1214 pdf:
1315 make -C builddir pdf
16+txt:
17+ make -C builddir/src txt
1418 $(ARCHS):
1519 make -C builddir ARCHS=$@
1620 EOF
--- /dev/null
+++ b/CLFSja/clfs-3.0.0-sysvinit/makedist.sh
@@ -0,0 +1,21 @@
1+#!/bin/sh
2+
3+pushd builddir
4+
5+make dist-bzip2
6+
7+make pdf
8+make txt
9+
10+cd render/html
11+rm -f ../CLFSja-SYSVINIT-html.tar.xz
12+tar cf - . | xz > ../CLFSja-SYSVINIT-html.tar.xz
13+
14+rm -f lfsbookja-svn-nochunks.html.bz2
15+bzip2 lfsbookja-svn.html
16+mv lfsbookja-svn.html.bz2 lfsbookja-svn-nochunks.html.bz2
17+
18+rm -f lfsbookja-svn.txt.bz2
19+bzip2 lfsbookja-svn.txt
20+
21+popd
--- /dev/null
+++ b/CLFSja/clfs-3.0.0-sysvinit/myconf.sh
@@ -0,0 +1,27 @@
1+#!/bin/sh
2+
3+if [ ! -f Makefile ]; then
4+cat > Makefile << "EOF"
5+ARCHS := x86 x86_64 x86_64-64 \
6+ sparc sparc64 sparc64-64 \
7+ mips mips64 mips64-64 \
8+ ppc ppc64 ppc64-64
9+
10+all:
11+ make -C builddir
12+nochunk:
13+ make -C builddir/src nochunks
14+pdf:
15+ make -C builddir pdf
16+txt:
17+ make -C builddir/src txt
18+$(ARCHS):
19+ make -C builddir ARCHS=$@
20+EOF
21+fi
22+
23+mkdir -p builddir
24+
25+cd builddir
26+../../../../src/CLFSja/cross-lfs-ja/configure \
27+ --with-bookdir=../../../../src/CLFS/cross-lfs/BOOK
--- /dev/null
+++ b/CLFSja/systemd/makedist.sh
@@ -0,0 +1,24 @@
1+#!/bin/sh
2+
3+pushd builddir
4+
5+#cp -pv src/lfs-bootscripts-*.tar.bz2 .
6+
7+make dist-bzip2
8+
9+popd
10+exit
11+make pdf
12+make txt
13+
14+rm -f lfsbookja-html.tar.bz2
15+tar cf - svn-ja | bzip2 > lfsbookja-svn-html.tar.bz2
16+
17+rm -f lfsbookja-svn-nochunks.html.bz2
18+bzip2 lfsbookja-svn.html
19+mv lfsbookja-svn.html.bz2 lfsbookja-svn-nochunks.html.bz2
20+
21+rm -f lfsbookja-svn.txt.bz2
22+bzip2 lfsbookja-svn.txt
23+
24+popd
--- /dev/null
+++ b/CLFSja/systemd/myconf.sh
@@ -0,0 +1,27 @@
1+#!/bin/sh
2+
3+if [ ! -f Makefile ]; then
4+cat > Makefile << "EOF"
5+ARCHS := x86 x86_64 x86_64-64 \
6+ sparc sparc64 sparc64-64 \
7+ mips mips64 mips64-64 \
8+ ppc ppc64 ppc64-64
9+
10+all:
11+ make -C builddir
12+nochunks:
13+ make -C builddir/src nochunks
14+pdf:
15+ make -C builddir pdf
16+$(ARCHS):
17+ make -C builddir ARCHS=$@
18+EOF
19+fi
20+
21+BOOKdir=../../../../src/CLFS/cross-lfs/BOOK
22+
23+mkdir -p builddir
24+
25+cd builddir
26+../../../../src/CLFSja/cross-lfs-ja/configure \
27+ --with-bookdir=../../../../src/CLFS/cross-lfs/BOOK
--- /dev/null
+++ b/CLFSja/sysvinit/makedist.sh
@@ -0,0 +1,24 @@
1+#!/bin/sh
2+
3+pushd builddir
4+
5+#cp -pv src/lfs-bootscripts-*.tar.bz2 .
6+
7+make dist-bzip2
8+
9+popd
10+exit
11+make pdf
12+make txt
13+
14+rm -f lfsbookja-html.tar.bz2
15+tar cf - svn-ja | bzip2 > lfsbookja-svn-html.tar.bz2
16+
17+rm -f lfsbookja-svn-nochunks.html.bz2
18+bzip2 lfsbookja-svn.html
19+mv lfsbookja-svn.html.bz2 lfsbookja-svn-nochunks.html.bz2
20+
21+rm -f lfsbookja-svn.txt.bz2
22+bzip2 lfsbookja-svn.txt
23+
24+popd
--- /dev/null
+++ b/CLFSja/sysvinit/myconf.sh
@@ -0,0 +1,27 @@
1+#!/bin/sh
2+
3+if [ ! -f Makefile ]; then
4+cat > Makefile << "EOF"
5+ARCHS := x86 x86_64 x86_64-64 \
6+ sparc sparc64 sparc64-64 \
7+ mips mips64 mips64-64 \
8+ ppc ppc64 ppc64-64
9+
10+all:
11+ make -C builddir
12+txt:
13+ make -C builddir/src nochunks
14+pdf:
15+ make -C builddir pdf
16+$(ARCHS):
17+ make -C builddir ARCHS=$@
18+EOF
19+fi
20+
21+BOOKdir=../../../../src/CLFS/cross-lfs/BOOK
22+
23+mkdir -p builddir
24+
25+cd builddir
26+../../../../src/CLFSja/cross-lfs-ja/configure \
27+ --with-bookdir=../../../../src/CLFS/cross-lfs/BOOK
--- a/blfsbookja/SVN/makedist.sh
+++ b/blfsbookja/SVN/makedist.sh
@@ -1,11 +1,13 @@
11 #!/bin/sh
22
3+pushd builddir
4+
35 make dist-bzip2
46 #make pdf
57 #make txt
68
79 rm -f blfsbookja-html.tar.bz2
8-tar cf - svn.ja | bzip2 > blfsbookja-svn-html.tar.bz2
10+tar cf - svn-ja | bzip2 > blfsbookja-svn-html.tar.bz2
911
1012 #rm -f lfsbookja-svn-nochunks.html.bz2
1113 #bzip2 lfsbookja-svn.html
@@ -14,3 +16,4 @@ tar cf - svn.ja | bzip2 > blfsbookja-svn-html.tar.bz2
1416 #rm -f lfsbookja-svn.txt.bz2
1517 #bzip2 lfsbookja-svn.txt
1618
19+popd
--- a/blfsbookja/SVN/myconf.sh
+++ b/blfsbookja/SVN/myconf.sh
@@ -2,8 +2,13 @@
22
33 if [ ! -f Makefile ]; then
44 cat > Makefile << "EOF"
5+export REV=sysv
6+
57 all:
6- cd builddir && make
8+ cd builddir && make
9+pdf:
10+ cd builddir && make pdf
11+EOF
712 EOF
813 fi
914
@@ -12,4 +17,5 @@ mkdir -p builddir
1217 cd builddir
1318 ../../../../src/blfsbookja/trunk/configure \
1419 --with-bookdir=../../../../src/BLFS/trunk/BOOK \
15- --with-ipafontdir=/usr/share/fonts/IPA
20+ --with-ipafontdir=/usr/share/fonts/IPA \
21+ --with-rev=sysv
--- a/blfscommit.sh
+++ b/blfscommit.sh
@@ -1,11 +1,12 @@
11 #!/bin/sh
22
3-cd ~/src/lfsbookja/trunk/blfsbook
3+cd ~/src/blfsbookja
44
5+svn commit -m "[BLFS-SVN] Version 2017-05-14, r18719 対応."
56 #svn commit -m "[BLFS-SVN] Version 2014-02-08, r12682 対応."
67 #svn commit -m "[BLFS-SVN] Version 2014-02-02, r12662 対応, その他訳出."
78 #svn commit -m "[BLFS-SVN] 訳出少々."
8-svn commit -m "[BLFS-SVN] 修正(途上) ."
9+#svn commit -m "[BLFS-SVN] 修正(途上) ."
910 #svn commit -m "[BLFS-SVN] 微修正."
1011 #svn commit -m "[BLFS-SVN] Version 2013-08-02, r11571."
1112 #svn commit -m "[BLFS-SVN] ドラフトモード設定."
--- a/lfsbookja/SVN.systemd/Makefile
+++ b/lfsbookja/SVN.systemd/Makefile
@@ -1,4 +1,4 @@
11 export REV=systemd
22
33 all:
4- cd builddir && make
4+ make -C builddir
--- a/lfsbookja/SVN.systemd/makedist.sh
+++ b/lfsbookja/SVN.systemd/makedist.sh
@@ -1,21 +1,19 @@
11 #!/bin/sh
22
3-export REV=systemd
4-
53 pushd builddir
64
75 make dist-bzip2
86 make pdf
97 make txt
108
11-rm -f lfsbookja-html.tar.bz2
12-tar cf - svn.ja | bzip2 > lfsbookja-svn-html.tar.bz2
9+rm -f lfssysdja-svn-html.tar.bz2
10+tar cf - svn-sysdja | bzip2 > lfssysdja-svn-html.tar.bz2
1311
14-rm -f lfsbookja-svn-nochunks.html.bz2
15-bzip2 lfsbookja-svn.html
16-mv lfsbookja-svn.html.bz2 lfsbookja-svn-nochunks.html.bz2
12+rm -f lfssysdja-svn.html.bz2
13+bzip2 lfssysdja-svn.html
14+mv lfssysdja-svn.html.bz2 lfssysdja-svn-nochunks.html.bz2
1715
18-rm -f lfsbookja-svn.txt.bz2
19-bzip2 lfsbookja-svn.txt
16+rm -f lfssysdja-svn.txt.bz2
17+bzip2 lfssysdja-svn.txt
2018
2119 popd
--- a/lfsbookja/SVN.systemd/myconf.sh
+++ b/lfsbookja/SVN.systemd/myconf.sh
@@ -1,8 +1,18 @@
11 #!/bin/sh
22
3+if [ ! -f Makefile ]; then
4+cat > Makefile << "EOF"
5+export REV=systemd
6+
7+all:
8+ make -C builddir
9+EOF
10+fi
11+
312 mkdir -p builddir
413
514 cd builddir
615 ../../../../src/lfsbookja/trunk/lfsbook/configure \
716 --prefix=/usr \
8- --with-bookdir=../../../../src/LFS/trunk/BOOK
17+ --with-bookdir=../../../../src/LFS/trunk/BOOK \
18+ --with-rev=systemd
--- a/lfsbookja/SVN/Makefile
+++ b/lfsbookja/SVN/Makefile
@@ -1,4 +1,4 @@
11 export REV=sysv
22
33 all:
4- cd builddir && make
4+ make -C builddir
--- a/lfsbookja/SVN/makedist.sh
+++ b/lfsbookja/SVN/makedist.sh
@@ -4,6 +4,8 @@ export REV=sysv
44
55 pushd builddir
66
7+cp -pv src/lfs-bootscripts-*.tar.bz2 .
8+
79 make dist-bzip2
810 make pdf
911 make txt
--- a/lfsbookja/SVN/myconf.sh
+++ b/lfsbookja/SVN/myconf.sh
@@ -5,7 +5,7 @@ cat > Makefile << "EOF"
55 export REV=sysv
66
77 all:
8- cd builddir && make
8+ make -C builddir
99 EOF
1010 fi
1111
--- a/lfscommit.sh
+++ b/lfscommit.sh
@@ -2,13 +2,17 @@
22
33 cd ~/src/lfsbookja/trunk/lfsbook
44
5-svn commit -m "[LFS-SVN] SVN-20160516, Changeset 11064 対応。"
5+svn commit -m "[LFS-SVN] SVN-20170518, チェンジセット11253 対応。"
6+#svn commit -m "[LFS-SVN] SVN-20170505, チェンジセット11245 対応。全般的な整備。 "
7+#svn commit -m "[LFS-SVN] 引き続き全般的な整備。"
8+#svn commit -m "[LFS-SVN] 第8章の /etc/fstab にて誤訳修正。"
69 #svn commit -m "[LFS-SVN] テキスト版にてローカルディレクトリ表記の改正。"
710 #svn commit -m "[LFS-SVN] OSDN.jpサイトへの変更。"
811 #svn commit -m "[LFS-SVN] ダウンロードsedスクリプトの更新。"
912 #svn commit -m "[LFS-SVN] SVN-20140418, Changeset 10541 対応。"
1013 #svn commit -m "[LFS-SVN] bootscriptのmd5sum適正化."
1114 #svn commit -m "[LFS-SVN] 訳出漏れ修正。(src/chapter03/packages.ch)"
15+#svn commit -m "[LFS-SVN] 訳出漏れ修正。"
1216 #svn commit -m "[LFS-SVN] 訳見直し."
1317 #svn commit -m "[LFS-SVN] 誤り修正."
1418 #svn commit -m "[LFS-SVN] propset修正."
--- a/systemdcommit.sh
+++ b/systemdcommit.sh
@@ -1,9 +1,7 @@
11 #!/bin/sh
22
3-cd ~/src/lfsbookja/branches/lfsbook
3+cd ~/src/lfsbookja/trunk/lfsbook
44
5-svn commit -m "[LFS-SYSTEMD] SYSTEMD-20140217, Changeset 10472 対応。"
6-#svn commit -m "[LFS-SYSTEMD] 不要ファイル削除."
7-#svn commit -m "[LFS-SYSTEMD] 訳出"
8-#svn commit -m "[LFS-SYSTEMD] Propset svn:ignore autom4te.cache."
5+#svn commit -m "[LFS-systemd] 20160611-systemd, Changeset 10472 対応。"
6+svn commit -m "[LFS-systemd] マージ対応"
97