1 |
commit: d13ad223dfdd2e3af0e8770961fc5c867374e9ba |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 28 15:29:18 2014 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 28 15:32:22 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=d13ad223 |
7 |
|
8 |
tools-musl: add DIGESTS and fix man-db parallel build |
9 |
|
10 |
--- |
11 |
tools-musl/portage/env/parallel.conf | 1 + |
12 |
tools-musl/portage/package.accept_keywords | 1 - |
13 |
tools-musl/portage/package.env | 1 + |
14 |
tools-musl/run.sh | 27 ++++++++++++++++++++++++++- |
15 |
4 files changed, 28 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/tools-musl/portage/env/parallel.conf b/tools-musl/portage/env/parallel.conf |
18 |
new file mode 100644 |
19 |
index 0000000..c67232a |
20 |
--- /dev/null |
21 |
+++ b/tools-musl/portage/env/parallel.conf |
22 |
@@ -0,0 +1 @@ |
23 |
+MAKEOPTS=-j1 |
24 |
|
25 |
diff --git a/tools-musl/portage/package.accept_keywords b/tools-musl/portage/package.accept_keywords |
26 |
index b74b45f..db7e39f 100644 |
27 |
--- a/tools-musl/portage/package.accept_keywords |
28 |
+++ b/tools-musl/portage/package.accept_keywords |
29 |
@@ -1,4 +1,3 @@ |
30 |
=sys-apps/getent-0 ~amd64 |
31 |
-=sys-apps/man-db-2.6.6 ~amd64 |
32 |
=sys-libs/musl-0.9.15 ~amd64 |
33 |
=app-text/openjade-1.3.2-r6 ~amd64 |
34 |
|
35 |
diff --git a/tools-musl/portage/package.env b/tools-musl/portage/package.env |
36 |
index 376f3c5..9179686 100644 |
37 |
--- a/tools-musl/portage/package.env |
38 |
+++ b/tools-musl/portage/package.env |
39 |
@@ -1,3 +1,4 @@ |
40 |
sys-apps/kbd libintl.conf |
41 |
+sys-apps/man-db parallel.conf |
42 |
sys-apps/net-tools libintl.conf |
43 |
sys-process/procps libintl.conf |
44 |
|
45 |
diff --git a/tools-musl/run.sh b/tools-musl/run.sh |
46 |
index b4c9c79..ae21c08 100755 |
47 |
--- a/tools-musl/run.sh |
48 |
+++ b/tools-musl/run.sh |
49 |
@@ -1,6 +1,6 @@ |
50 |
#!/bin/bash |
51 |
|
52 |
-ROOTFS="stage4-amd64-musl" |
53 |
+ROOTFS="stage4-amd64-musl-vanilla" |
54 |
PWD="$(pwd)" |
55 |
|
56 |
prepare_etc () { |
57 |
@@ -41,6 +41,30 @@ setup_configs() { |
58 |
sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf |
59 |
} |
60 |
|
61 |
+bundle_it() { |
62 |
+ local DATE=$(date +%Y%m%d) |
63 |
+ local NAME="${ROOTFS}"-"${DATE}".tar.bz2 |
64 |
+ local DIGESTS="${NAME}".DIGESTS |
65 |
+ |
66 |
+ cd "${ROOTFS}" |
67 |
+ tar -j -c -f ../"${NAME}" . |
68 |
+ |
69 |
+ cd .. |
70 |
+ >"${DIGESTS}" |
71 |
+ |
72 |
+ echo "# MD5 HASH" >> "${DIGESTS}" |
73 |
+ md5sum "${NAME}" >> "${DIGESTS}" |
74 |
+ |
75 |
+ echo "# SHA1 HASH" >> "${DIGESTS}" |
76 |
+ sha1sum "${NAME}" >> "${DIGESTS}" |
77 |
+ |
78 |
+ echo "# SHA512 HASH" >> "${DIGESTS}" |
79 |
+ sha512sum "${NAME}" >> "${DIGESTS}" |
80 |
+ |
81 |
+ echo "# WHIRLPOOL HASH" >> "${DIGESTS}" |
82 |
+ whirlpooldeep "${NAME}" >> "${DIGESTS}" |
83 |
+} |
84 |
+ |
85 |
main (){ |
86 |
prepare_etc |
87 |
prepare_usr_etc |
88 |
@@ -48,6 +72,7 @@ main (){ |
89 |
emerge_system |
90 |
mk_top_level_dirs |
91 |
setup_configs |
92 |
+ bundle_it |
93 |
} |
94 |
|
95 |
main > zzz.log 2>&1 & |