9 files changed, 13 insertions, 5 deletions
diff --git a/tools-uclibc/portage.amd64.vanilla/package.use/gcc b/tools-uclibc/portage.amd64.vanilla/package.use/gcc
new file mode 100644
index 00000000..15bbd8aa
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.use/gcc
@@ -0,0 +1 @@
+sys-devel/gcc -sanitize
diff --git a/tools-uclibc/portage.amd64.vanilla/package.use/gdbm b/tools-uclibc/portage.amd64.vanilla/package.use/gdbm
new file mode 100644
index 00000000..57838c5a
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.use/gdbm
@@ -0,0 +1 @@
+sys-libs/gdbm berkdb
diff --git a/tools-uclibc/portage.i686.hardened/package.use/gzip b/tools-uclibc/portage.i686.hardened/package.use/gzip
new file mode 100644
index 00000000..9bc0ea56
--- /dev/null
+++ b/tools-uclibc/portage.i686.hardened/package.use/gzip
@@ -0,0 +1 @@
+app-arch/gzip pic
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/gcc b/tools-uclibc/portage.i686.vanilla/package.use/gcc
new file mode 100644
index 00000000..15bbd8aa
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.use/gcc
@@ -0,0 +1 @@
+sys-devel/gcc -sanitize
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/gdbm b/tools-uclibc/portage.i686.vanilla/package.use/gdbm
new file mode 100644
index 00000000..57838c5a
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.use/gdbm
@@ -0,0 +1 @@
+sys-libs/gdbm berkdb
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/gzip b/tools-uclibc/portage.i686.vanilla/package.use/gzip
new file mode 100644
index 00000000..9bc0ea56
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.use/gzip
@@ -0,0 +1 @@
+app-arch/gzip pic
diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh
index d2fb9e23..89984a3c 100755
--- a/tools-uclibc/run-armv7a.sh
+++ b/tools-uclibc/run-armv7a.sh
@@ -29,6 +29,7 @@ prepare_confs() {
         -e "s:PSTAGE:${pstage}:g" \
         -e "s:SARCH:${arch}:g" \
         -e "s:PARCH:${parch}:g" \
+        -e "s:TARCHPROFILE:/${tarch}${profile}:g" \
         -e "s:TARCH:${tarch}:g" \
         -e "s:gentoo-linux-uclibc:unknown-linux-uclibceabi${float}:" \
         -e "s:FLAVOR:${flavor}:g" \
diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh
index 61dd936b..cdc0def9 100755
--- a/tools-uclibc/run.sh
+++ b/tools-uclibc/run.sh
@@ -20,17 +20,18 @@ prepare_confs() {
     [[ "${arch}" == "amd64" ]] && tarch="x86_64"
 
     local profile=${flavor}
-    [[ "${flavor}" == "vanilla" ]] && profile="default"
+    [[ "${flavor}" == "vanilla" ]] && profile="" || profile="/hardened"
 
-    cat stage-all.conf.template | \
+    cat stage.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
         -e "s:CSTAGE:${cstage}:g" \
         -e "s:PSTAGE:${pstage}:g" \
         -e "s:SARCH:${arch}:g" \
         -e "s:PARCH:${parch}:g" \
+        -e "s:TARCHPROFILE:${profile}:g" \
         -e "s:TARCH:${tarch}:g" \
+        -e "s:gentoo-linux-uclibc:unknown-linux-uclibc:" \
         -e "s:FLAVOR:${flavor}:g" \
-        -e "s:PROFILE:${profile}:g" \
         -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-uclibc-${flavor}.conf
   done
@@ -42,7 +43,7 @@ prepare_confs() {
 main() {
   >zzz.log
 
-  undo_grsec
+#  undo_grsec
 
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
diff --git a/tools-uclibc/stage.conf.template b/tools-uclibc/stage.conf.template
index c3bc1f6f..c0125a0c 100644
--- a/tools-uclibc/stage.conf.template
+++ b/tools-uclibc/stage.conf.template
@@ -2,7 +2,7 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: uclibc-FLAVOR
 rel_type: uclibc/FLAVOR/SARCH
-profile: default/linux/PARCH/17.0/uclibc/TARCHPROFILE
+profile: default/linux/PARCH/17.0/uclibcTARCHPROFILE
 snapshot: current
 source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR
 chost: TARCH-gentoo-linux-uclibc