| 1 |
commit: 173c8438ab199813189eb950df201d432b3b940f |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 8 19:29:51 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 8 19:29:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=173c8438 |
| 7 |
|
| 8 |
tools-uclibc: changes for the new 17.0 profiles for amd64 and x86 |
| 9 |
|
| 10 |
tools-uclibc/portage.amd64.vanilla/package.use/gcc | 1 + |
| 11 |
tools-uclibc/portage.amd64.vanilla/package.use/gdbm | 1 + |
| 12 |
tools-uclibc/portage.i686.hardened/package.use/gzip | 1 + |
| 13 |
tools-uclibc/portage.i686.vanilla/package.use/gcc | 1 + |
| 14 |
tools-uclibc/portage.i686.vanilla/package.use/gdbm | 1 + |
| 15 |
tools-uclibc/portage.i686.vanilla/package.use/gzip | 1 + |
| 16 |
tools-uclibc/run-armv7a.sh | 1 + |
| 17 |
tools-uclibc/run.sh | 9 +++++---- |
| 18 |
tools-uclibc/stage.conf.template | 2 +- |
| 19 |
9 files changed, 13 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/tools-uclibc/portage.amd64.vanilla/package.use/gcc b/tools-uclibc/portage.amd64.vanilla/package.use/gcc |
| 22 |
new file mode 100644 |
| 23 |
index 00000000..15bbd8aa |
| 24 |
--- /dev/null |
| 25 |
+++ b/tools-uclibc/portage.amd64.vanilla/package.use/gcc |
| 26 |
@@ -0,0 +1 @@ |
| 27 |
+sys-devel/gcc -sanitize |
| 28 |
|
| 29 |
diff --git a/tools-uclibc/portage.amd64.vanilla/package.use/gdbm b/tools-uclibc/portage.amd64.vanilla/package.use/gdbm |
| 30 |
new file mode 100644 |
| 31 |
index 00000000..57838c5a |
| 32 |
--- /dev/null |
| 33 |
+++ b/tools-uclibc/portage.amd64.vanilla/package.use/gdbm |
| 34 |
@@ -0,0 +1 @@ |
| 35 |
+sys-libs/gdbm berkdb |
| 36 |
|
| 37 |
diff --git a/tools-uclibc/portage.i686.hardened/package.use/gzip b/tools-uclibc/portage.i686.hardened/package.use/gzip |
| 38 |
new file mode 100644 |
| 39 |
index 00000000..9bc0ea56 |
| 40 |
--- /dev/null |
| 41 |
+++ b/tools-uclibc/portage.i686.hardened/package.use/gzip |
| 42 |
@@ -0,0 +1 @@ |
| 43 |
+app-arch/gzip pic |
| 44 |
|
| 45 |
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/gcc b/tools-uclibc/portage.i686.vanilla/package.use/gcc |
| 46 |
new file mode 100644 |
| 47 |
index 00000000..15bbd8aa |
| 48 |
--- /dev/null |
| 49 |
+++ b/tools-uclibc/portage.i686.vanilla/package.use/gcc |
| 50 |
@@ -0,0 +1 @@ |
| 51 |
+sys-devel/gcc -sanitize |
| 52 |
|
| 53 |
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/gdbm b/tools-uclibc/portage.i686.vanilla/package.use/gdbm |
| 54 |
new file mode 100644 |
| 55 |
index 00000000..57838c5a |
| 56 |
--- /dev/null |
| 57 |
+++ b/tools-uclibc/portage.i686.vanilla/package.use/gdbm |
| 58 |
@@ -0,0 +1 @@ |
| 59 |
+sys-libs/gdbm berkdb |
| 60 |
|
| 61 |
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/gzip b/tools-uclibc/portage.i686.vanilla/package.use/gzip |
| 62 |
new file mode 100644 |
| 63 |
index 00000000..9bc0ea56 |
| 64 |
--- /dev/null |
| 65 |
+++ b/tools-uclibc/portage.i686.vanilla/package.use/gzip |
| 66 |
@@ -0,0 +1 @@ |
| 67 |
+app-arch/gzip pic |
| 68 |
|
| 69 |
diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh |
| 70 |
index d2fb9e23..89984a3c 100755 |
| 71 |
--- a/tools-uclibc/run-armv7a.sh |
| 72 |
+++ b/tools-uclibc/run-armv7a.sh |
| 73 |
@@ -29,6 +29,7 @@ prepare_confs() { |
| 74 |
-e "s:PSTAGE:${pstage}:g" \ |
| 75 |
-e "s:SARCH:${arch}:g" \ |
| 76 |
-e "s:PARCH:${parch}:g" \ |
| 77 |
+ -e "s:TARCHPROFILE:/${tarch}${profile}:g" \ |
| 78 |
-e "s:TARCH:${tarch}:g" \ |
| 79 |
-e "s:gentoo-linux-uclibc:unknown-linux-uclibceabi${float}:" \ |
| 80 |
-e "s:FLAVOR:${flavor}:g" \ |
| 81 |
|
| 82 |
diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh |
| 83 |
index 61dd936b..cdc0def9 100755 |
| 84 |
--- a/tools-uclibc/run.sh |
| 85 |
+++ b/tools-uclibc/run.sh |
| 86 |
@@ -20,17 +20,18 @@ prepare_confs() { |
| 87 |
[[ "${arch}" == "amd64" ]] && tarch="x86_64" |
| 88 |
|
| 89 |
local profile=${flavor} |
| 90 |
- [[ "${flavor}" == "vanilla" ]] && profile="default" |
| 91 |
+ [[ "${flavor}" == "vanilla" ]] && profile="" || profile="/hardened" |
| 92 |
|
| 93 |
- cat stage-all.conf.template | \ |
| 94 |
+ cat stage.conf.template | \ |
| 95 |
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ |
| 96 |
-e "s:CSTAGE:${cstage}:g" \ |
| 97 |
-e "s:PSTAGE:${pstage}:g" \ |
| 98 |
-e "s:SARCH:${arch}:g" \ |
| 99 |
-e "s:PARCH:${parch}:g" \ |
| 100 |
+ -e "s:TARCHPROFILE:${profile}:g" \ |
| 101 |
-e "s:TARCH:${tarch}:g" \ |
| 102 |
+ -e "s:gentoo-linux-uclibc:unknown-linux-uclibc:" \ |
| 103 |
-e "s:FLAVOR:${flavor}:g" \ |
| 104 |
- -e "s:PROFILE:${profile}:g" \ |
| 105 |
-e "s:MYCATALYST:$(pwd):g" \ |
| 106 |
> stage${s}-${arch}-uclibc-${flavor}.conf |
| 107 |
done |
| 108 |
@@ -42,7 +43,7 @@ prepare_confs() { |
| 109 |
main() { |
| 110 |
>zzz.log |
| 111 |
|
| 112 |
- undo_grsec |
| 113 |
+# undo_grsec |
| 114 |
|
| 115 |
catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
| 116 |
|
| 117 |
|
| 118 |
diff --git a/tools-uclibc/stage.conf.template b/tools-uclibc/stage.conf.template |
| 119 |
index c3bc1f6f..c0125a0c 100644 |
| 120 |
--- a/tools-uclibc/stage.conf.template |
| 121 |
+++ b/tools-uclibc/stage.conf.template |
| 122 |
@@ -2,7 +2,7 @@ subarch: SARCH |
| 123 |
target: CSTAGE |
| 124 |
version_stamp: uclibc-FLAVOR |
| 125 |
rel_type: uclibc/FLAVOR/SARCH |
| 126 |
-profile: default/linux/PARCH/17.0/uclibc/TARCHPROFILE |
| 127 |
+profile: default/linux/PARCH/17.0/uclibcTARCHPROFILE |
| 128 |
snapshot: current |
| 129 |
source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR |
| 130 |
chost: TARCH-gentoo-linux-uclibc |
Archives