[gentoo-commits] proj/releng:master commit in: tools-musl/portage.amd64.hardened-stage4/, ...

[Matt Thode]

commit:     24a82d21d063ab48080b054ca3a604a555faf8fa
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Sun Jun 24 02:08:27 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 02:08:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=24a82d21

update musl stage generation

 tools-musl/.gitignore                                                | 1 +
 tools-musl/portage.amd64.hardened-stage4/.keep                       | 0
 .../portage.amd64.hardened-stage4/package.accept_keywords/stage4     | 4 ----
 tools-musl/portage.amd64.hardened/package.accept_keywords/stage3     | 4 ++++
 .../package.use/stage4                                               | 1 +
 tools-musl/run-armv7a.sh                                             | 2 +-
 tools-musl/run.sh                                                    | 4 ----
 tools-musl/stage4-hardened-amd64.spec                                | 5 +++--
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tools-musl/.gitignore b/tools-musl/.gitignore
index dedc27df..2315a4e4 100644
--- a/tools-musl/.gitignore
+++ b/tools-musl/.gitignore
@@ -1,2 +1,3 @@
 *log
 *err
+stage*.conf

diff --git a/tools-musl/portage.amd64.hardened-stage4/.keep 
b/tools-musl/portage.amd64.hardened-stage4/.keep
deleted file mode 100644
index e69de29b..00000000

diff --git 
a/tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4 
b/tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4
deleted file mode 100644
index c636d541..00000000
--- a/tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4
+++ /dev/null
@@ -1,4 +0,0 @@
-=net-analyzer/macchanger-1.7.0-r1 ~amd64
-=sys-apps/busybox-1.26.2-r1::musl ~amd64
-=sys-kernel/genkernel-3.5.2.4 ~amd64
-=app-misc/pax-utils-1.2.2-r2 ~amd64

diff --git a/tools-musl/portage.amd64.hardened/package.accept_keywords/stage3 
b/tools-musl/portage.amd64.hardened/package.accept_keywords/stage3
new file mode 100644
index 00000000..869b28ec
--- /dev/null
+++ b/tools-musl/portage.amd64.hardened/package.accept_keywords/stage3
@@ -0,0 +1,4 @@
+# needed for layman / stage4
+=net-analyzer/macchanger-1.7.0-r1 ~amd64
+=dev-libs/openssl-1.0.2o-r6 ~amd64
+=dev-python/cryptography-2.1.4-r2 ~amd64

diff --git a/tools-musl/portage.amd64.hardened-stage4/package.use/stage4 
b/tools-musl/portage.amd64.hardened/package.use/stage4
similarity index 79%
rename from tools-musl/portage.amd64.hardened-stage4/package.use/stage4
rename to tools-musl/portage.amd64.hardened/package.use/stage4
index 0e2af675..5f8147ac 100644
--- a/tools-musl/portage.amd64.hardened-stage4/package.use/stage4
+++ b/tools-musl/portage.amd64.hardened/package.use/stage4
@@ -2,3 +2,4 @@ app-admin/syslog-ng -tcpd
 sys-apps/kmod lzma  # kernel module compression
 sys-apps/util-linux static-libs  # for genkernel
 sys-boot/grub grub_platforms_pc
+dev-lang/python xml sqlite  # for layman

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index dca3450a..bec98577 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -23,7 +23,7 @@ prepare_confs() {
     local profile=${flavor}
     [[ "${flavor}" == "vanilla" ]] && profile="default"
 
-    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" \

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 9140ac35..c3065958 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -63,10 +63,6 @@ main() {
     for flavor in hardened vanilla; do
       do_stages ${arch} ${flavor}
       [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-#      (
-#        do_stages ${arch} ${flavor}
-#        [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-#      ) &
     done
   done
 }

diff --git a/tools-musl/stage4-hardened-amd64.spec 
b/tools-musl/stage4-hardened-amd64.spec
index 5e738c22..ad829a44 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -2,10 +2,10 @@ subarch: amd64
 target: stage4
 version_stamp: musl-hardened-MY_DATE
 rel_type: musl/hardened/amd64
-profile: hardened/linux/musl/amd64
+profile: default/linux/amd64/17.0/musl/hardened
 snapshot: current
 source_subpath: musl/hardened/amd64/stage3-amd64-musl-hardened
-portage_confdir: @REPO_DIR@/portage.amd64.hardened-stage4
+portage_confdir: @REPO_DIR@/portage.amd64.hardened
 portage_overlay: /opt/overlays/musl
 
 stage4/use:
@@ -21,6 +21,7 @@ stage4/use:
 
 stage4/packages:
        app-admin/syslog-ng
+       app-portage/layman
        dev-util/pkgconf
        net-misc/dhcpcd
        sys-apps/iproute2