1 |
commit: 4cabd6acedc5f444e4778b6db6a90308ac301db5 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 5 11:40:04 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 5 11:40:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4cabd6ac |
7 |
|
8 |
tools-uclibc: update arm build for new 17.0 profiles |
9 |
|
10 |
.../package.accept_keywords/iproute2 | 1 + |
11 |
.../package.accept_keywords/iproute2 | 1 + |
12 |
tools-uclibc/run-armv7a.sh | 16 +++++++--------- |
13 |
tools-uclibc/stage.conf.template | 9 +++++++++ |
14 |
4 files changed, 18 insertions(+), 9 deletions(-) |
15 |
|
16 |
diff --git a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/iproute2 b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/iproute2 |
17 |
new file mode 100644 |
18 |
index 00000000..219f7431 |
19 |
--- /dev/null |
20 |
+++ b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/iproute2 |
21 |
@@ -0,0 +1 @@ |
22 |
+=sys-apps/iproute2-4.18.0 ~arm |
23 |
|
24 |
diff --git a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/iproute2 b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/iproute2 |
25 |
new file mode 100644 |
26 |
index 00000000..219f7431 |
27 |
--- /dev/null |
28 |
+++ b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/iproute2 |
29 |
@@ -0,0 +1 @@ |
30 |
+=sys-apps/iproute2-4.18.0 ~arm |
31 |
|
32 |
diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh |
33 |
index 695a985c..d2fb9e23 100755 |
34 |
--- a/tools-uclibc/run-armv7a.sh |
35 |
+++ b/tools-uclibc/run-armv7a.sh |
36 |
@@ -13,24 +13,24 @@ prepare_confs() { |
37 |
[[ $p == 0 ]] && p=3 |
38 |
local pstage=stage${p} |
39 |
local tarch="${arch%_hardfp}" |
40 |
- local parch="arm/${tarch}" |
41 |
+ local parch="arm" |
42 |
local float |
43 |
|
44 |
[[ "${arch}" == "${tarch}" ]] \ |
45 |
- && float="softfp" \ |
46 |
- || float="hardfloat" |
47 |
+ && float="" \ |
48 |
+ || float="hf" |
49 |
|
50 |
local profile=${flavor} |
51 |
- [[ "${flavor}" == "vanilla" ]] && profile="default" |
52 |
+ [[ "${flavor}" == "vanilla" ]] && profile="" || profile="/hardened" |
53 |
|
54 |
- cat stage-all.conf.template | \ |
55 |
+ cat stage.conf.template | \ |
56 |
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ |
57 |
-e "s:CSTAGE:${cstage}:g" \ |
58 |
-e "s:PSTAGE:${pstage}:g" \ |
59 |
-e "s:SARCH:${arch}:g" \ |
60 |
-e "s:PARCH:${parch}:g" \ |
61 |
-e "s:TARCH:${tarch}:g" \ |
62 |
- -e "s:gentoo-linux-uclibc:${float}-linux-uclibceabi:" \ |
63 |
+ -e "s:gentoo-linux-uclibc:unknown-linux-uclibceabi${float}:" \ |
64 |
-e "s:FLAVOR:${flavor}:g" \ |
65 |
-e "s:PROFILE:${profile}:g" \ |
66 |
-e "s:MYCATALYST:$(pwd):g" \ |
67 |
@@ -46,8 +46,6 @@ prepare_confs() { |
68 |
|
69 |
|
70 |
main() { |
71 |
- >zzz.log |
72 |
- |
73 |
catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
74 |
|
75 |
# for arch in armv7a_hardfp armv7a; do |
76 |
@@ -57,7 +55,7 @@ main() { |
77 |
done |
78 |
done |
79 |
|
80 |
- # No parallelization for arm. Its too hard on the cpu! |
81 |
+# No parallelization for arm. Its too hard on the cpu! |
82 |
# for arch in armv7a_hardfp armv7a; do |
83 |
for arch in armv7a_hardfp; do |
84 |
for flavor in hardened vanilla; do |
85 |
|
86 |
diff --git a/tools-uclibc/stage.conf.template b/tools-uclibc/stage.conf.template |
87 |
new file mode 100644 |
88 |
index 00000000..c3bc1f6f |
89 |
--- /dev/null |
90 |
+++ b/tools-uclibc/stage.conf.template |
91 |
@@ -0,0 +1,9 @@ |
92 |
+subarch: SARCH |
93 |
+target: CSTAGE |
94 |
+version_stamp: uclibc-FLAVOR |
95 |
+rel_type: uclibc/FLAVOR/SARCH |
96 |
+profile: default/linux/PARCH/17.0/uclibc/TARCHPROFILE |
97 |
+snapshot: current |
98 |
+source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR |
99 |
+chost: TARCH-gentoo-linux-uclibc |
100 |
+portage_confdir: MYCATALYST/portage.SARCH.FLAVOR |