[gentoo-commits] proj/releng:master commit in: tools-systemd/portage.amd64/package.use/, tools-systemd/, ...

2020-12-19 Thread Anthony G. Basile 
commit: c2551192129966e98a59bbab79721cdbd440d34f
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Dec 19 20:42:16 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Dec 19 20:42:16 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=c2551192

tools-systemd: deprecated

Signed-off-by: Anthony G. Basile  gentoo.org>

 tools-systemd/.gitignore   |  3 -
 tools-systemd/catalyst.conf.local  | 31 -
 tools-systemd/clean.sh |  6 --
 tools-systemd/common.sh| 61 --
 .../portage.amd64/package.use/releng/iputils   |  1 -
 tools-systemd/portage.amd64/package.use/releng/pam |  1 -
 tools-systemd/portage.amd64/package.use/util-linux |  1 -
 tools-systemd/portage.arm64/package.use/glibc  |  1 -
 .../portage.arm64/package.use/releng/iputils   |  1 -
 tools-systemd/portage.arm64/package.use/releng/pam |  1 -
 tools-systemd/portage.arm64/package.use/util-linux |  1 -
 .../portage.i686/package.use/releng/iputils|  1 -
 tools-systemd/portage.i686/package.use/releng/pam  |  1 -
 tools-systemd/portage.i686/package.use/util-linux  |  1 -
 tools-systemd/run-arm64.sh | 46 --
 tools-systemd/run.sh   | 61 --
 tools-systemd/stage-all.conf.template  |  9 ---
 tools-systemd/stage4-amd64.spec| 74 --
 18 files changed, 301 deletions(-)

diff --git a/tools-systemd/.gitignore b/tools-systemd/.gitignore
deleted file mode 100644
index 2315a4e4..
--- a/tools-systemd/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*log
-*err
-stage*.conf

diff --git a/tools-systemd/catalyst.conf.local 
b/tools-systemd/catalyst.conf.local
deleted file mode 100644
index 91d3c926..
--- a/tools-systemd/catalyst.conf.local
+++ /dev/null
@@ -1,31 +0,0 @@
-# Custom catalyst.conf file
-
-digests="sha512 whirlpool"
-
-contents="auto"
-
-distdir="/release/tmp/distfiles"
-
-envscript="/etc/catalyst/catalystrc"
-
-hash_function="crc32"
-
-#options="autoresume bindist kerncache pkgcache seedcache snapcache"
-options="autoresume bindist kerncache pkgcache seedcache"
-
-portdir="/usr/portage"
-
-repo_basedir="/var/db/repos"
-repo_name="gentoo"
-target_distdir="/var/cache/distfiles"
-target_pkgdir="/var/cache/binpkgs"
-
-sharedir="/usr/share/catalyst"
-
-shdir="%(sharedir)s/targets"
-
-snapshot_cache="/release/buildroot/alt-dev/snapshot_cache"
-
-storedir="/release/buildroot/alt-dev"
-
-source_matching="strict"

diff --git a/tools-systemd/clean.sh b/tools-systemd/clean.sh
deleted file mode 100755
index 916c4eb4..
--- a/tools-systemd/clean.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# This just removes the temporary conf err and log
-# files generated during a run
-
-rm -f *conf *err *log

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
deleted file mode 100644
index 60aac2a2..
--- a/tools-systemd/common.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-source $(pwd)/catalyst.conf.local
-
-mydate=$(date +%Y%m%d)
-
-
-undo_grsec() {
-  [[ -d /proc/sys/kernel/grsecurity ]] || return
-  for i in /proc/sys/kernel/grsecurity/chroot_* ; do
-echo 0 > $i
-  done
-}
-
-
-banner() {
-cat << EOF | tee -a zzz.log > stage$1-$2-systemd.log
-
-
-*stage$1-$2-systemd
-"
-
-EOF
-}
-
-
-do_stages() {
-  local arch=$1
-
-  for s in 1 2 3; do
-local tgpath="${storedir}/builds/systemd/${arch}"
-local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
-local tglink="stage${s}-${arch}-systemd.tar.bz2"
-if [[ ! -f "${tgpath}/${tglink}" ]]; then
-   touch stage${s}-${arch}-systemd.log
-   echo "!!! ${tglink} at ${tgpath} doesn't exist" \
- | tee -a zzz.log \
- > stage${s}-${arch}-systemd.err
-   return 1
-fi
-
-banner ${s} ${arch}
-catalyst -c $(pwd)/catalyst.conf.local \
-  -f stage${s}-${arch}-systemd.conf \
-  | tee -a zzz.log \
-  > stage${s}-${arch}-systemd.log \
-  2> stage${s}-${arch}-systemd.err
-
-if [[ -f "${tgpath}/${target}" ]]; then
-  rm -f "${tgpath}/${tglink}"
-  ln -s ${target} "${tgpath}/${tglink}"
-else
-  echo "!!! ${target} was not generated" \
-| tee -a zzz.log \
->stage${s}-${arch}-systemd.err
-  return 1
-fi
-  done
-
-  return 0
-}

diff --git a/tools-systemd/portage.amd64/package.use/releng/iputils 
b/tools-systemd/portage.amd64/package.use/releng/iputils
deleted file mode 100644
index 9cde931b..
--- a/tools-systemd/portage.amd64/package.use/releng/iputils
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/iputils -caps -filecaps

diff --git a/tools-systemd/portage.amd64/package.use/releng/pam 
b/tools-systemd/portage.amd64/package.use/releng/pam

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2019-09-02 Thread Anthony G. Basile 
commit: 3b930c42f6251cc51fff878ef3b8c84e7fb2bb01
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Sep  2 14:45:17 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Sep  2 14:45:17 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3b930c42

tools-systemd: bump to 17.1 profiles

 tools-systemd/run.sh  | 3 +++
 tools-systemd/stage-all.conf.template | 2 +-
 tools-systemd/stage4-amd64.spec   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index bdaf5a4d..057a06f4 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -30,6 +30,9 @@ prepare_confs() {
 -e "s:@REPO_DIR@:${repo_dir}:g" \
 -e "s:MYCATALYST:$(pwd):g" \
 >  stage${s}-${arch}-systemd.conf
+
+[[ $arch == i686 ]] && \
+  sed -i -e 's/17.1/17.0/' stage${s}-${arch}-systemd.conf
   done
 }
 

diff --git a/tools-systemd/stage-all.conf.template 
b/tools-systemd/stage-all.conf.template
index fbfcf5eb..270352bd 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -2,7 +2,7 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
-profile: default/linux/PARCH/17.0/systemd
+profile: default/linux/PARCH/17.1/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
 portage_confdir: MYCATALYST/portage.SARCH

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
index 72d49923..1ca4f029 100644
--- a/tools-systemd/stage4-amd64.spec
+++ b/tools-systemd/stage4-amd64.spec
@@ -2,7 +2,7 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
-profile: default/linux/PARCH/17.0/systemd
+profile: default/linux/PARCH/17.1/systemd
 snapshot: current
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip

[gentoo-commits] proj/releng:master commit in: tools-systemd/, releases/weekly/portage/stages/

2019-06-04 Thread Matthew Thode 
commit: 95926d37fa1365e5570d08454df33f0500cd5249
Author: Matthew Thode  mthode  org>
AuthorDate: Tue Jun  4 15:58:11 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun  4 15:58:11 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=95926d37

use a more limited stage4 portage confdir

and don't set licenses for stages 1-3

 releases/weekly/portage/stages/package.license | 3 ---
 tools-systemd/stage4-amd64.spec| 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/releases/weekly/portage/stages/package.license 
b/releases/weekly/portage/stages/package.license
deleted file mode 100644
index c5fd72de..
--- a/releases/weekly/portage/stages/package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# Allow linux-firmware and other required packages in @BINARY-REDISTRIBUTABLE
-# license group
-*/* @BINARY-REDISTRIBUTABLE

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
index 77c13894..72d49923 100644
--- a/tools-systemd/stage4-amd64.spec
+++ b/tools-systemd/stage4-amd64.spec
@@ -7,7 +7,7 @@ snapshot: current
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/
+portage_confdir: @REPO_DIR@/tools-musl/portage.amd64.hardened.stage4
 
 stage4/use:
bash-completion

[gentoo-commits] proj/releng:master commit in: tools-systemd/, releases/weekly/specs/amd64/, tools-musl/, ...

2019-05-22 Thread Matthew Thode 
commit: 20f098ddb3087ce4013bcdcdb040a371ff8eefef
Author: Matthew Thode  mthode  org>
AuthorDate: Wed May 22 14:52:08 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed May 22 14:52:08 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=20f098dd

add decompressor_search_order to stage4 specs

 releases/weekly/specs/amd64/hardened/stage4-minimal.spec| 1 +
 releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 1 +
 releases/weekly/specs/amd64/stage4-minimal.spec | 1 +
 releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec  | 1 +
 releases/weekly/specs/arm64/stage4-minimal.spec | 1 +
 tools-musl/stage4-hardened-amd64.spec   | 1 +
 tools-systemd/stage4-amd64.spec | 1 +
 7 files changed, 7 insertions(+)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec 
b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
index a69971ea..084b223e 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: default/linux/amd64/17.0/hardened
 snapshot: latest
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: hardened/stage3-amd64-hardened-latest
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 

diff --git 
a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec 
b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index 6c7a6841..f3ef8a32 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: default/linux/amd64/17.0/no-multilib/hardened
 snapshot: latest
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec 
b/releases/weekly/specs/amd64/stage4-minimal.spec
index f8618ac4..e54ec31f 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
@@ -5,6 +5,7 @@ rel_type: default
 profile: default/linux/amd64/17.0
 snapshot: latest
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: default/stage3-amd64-latest
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec 
b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
index 546c6052..5db175b4 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
@@ -5,6 +5,7 @@ rel_type: default
 profile: default/linux/amd64/17.0/no-multilib
 snapshot: latest
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: default/stage3-amd64-nomultilib-latest
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 

diff --git a/releases/weekly/specs/arm64/stage4-minimal.spec 
b/releases/weekly/specs/arm64/stage4-minimal.spec
index d4d762b3..3f9d57a8 100644
--- a/releases/weekly/specs/arm64/stage4-minimal.spec
+++ b/releases/weekly/specs/arm64/stage4-minimal.spec
@@ -5,6 +5,7 @@ rel_type: default
 profile: default/linux/arm64/17.0
 snapshot: current
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: default/stage3-arm64-2008.0
 #portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 

diff --git a/tools-musl/stage4-hardened-amd64.spec 
b/tools-musl/stage4-hardened-amd64.spec
index ecae1f3a..8d1bf8ea 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -5,6 +5,7 @@ rel_type: musl/hardened/amd64
 profile: default/linux/amd64/17.0/musl/hardened
 snapshot: current
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: musl/hardened/amd64/stage3-amd64-musl-hardened
 portage_confdir: @REPO_DIR@/portage.amd64.hardened.stage4
 portage_overlay: /opt/overlays/musl

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
index e656d3a9..77c13894 100644
--- a/tools-systemd/stage4-amd64.spec
+++ b/tools-systemd/stage4-amd64.spec
@@ -5,6 +5,7 @@ rel_type: systemd/SARCH
 profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/

[gentoo-commits] proj/releng:master commit in: tools-systemd/portage.arm64/package.use/

2019-04-11 Thread Anthony G. Basile 
commit: ed8666eb04a859b7e150ec2e73d6295935403888
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Apr 11 11:48:09 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Apr 11 11:48:23 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ed8666eb

tools-systemd: USE=suid for glibc on arm64 systemd

Signed-off-by: Anthony G. Basile  gentoo.org>

 tools-systemd/portage.arm64/package.use/glibc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools-systemd/portage.arm64/package.use/glibc 
b/tools-systemd/portage.arm64/package.use/glibc
new file mode 100644
index ..9c539187
--- /dev/null
+++ b/tools-systemd/portage.arm64/package.use/glibc
@@ -0,0 +1 @@
+sys-libs/glibc suid

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2019-04-10 Thread Anthony G. Basile 
commit: 0af725155ec24bc6c38df7e720b86b67e5f2e016
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Apr 10 12:11:35 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Apr 10 12:12:24 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0af72515

tools-systemd/run-arm64.sh: no grsec kernel

Signed-off-by: Anthony G. Basile  gentoo.org>

 tools-systemd/run-arm64.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools-systemd/run-arm64.sh b/tools-systemd/run-arm64.sh
index 41c4afc8..95009f8a 100755
--- a/tools-systemd/run-arm64.sh
+++ b/tools-systemd/run-arm64.sh
@@ -31,8 +31,6 @@ prepare_confs() {
 main() {
   >zzz.log
 
-  undo_grsec
-
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in arm64; do
@@ -43,7 +41,6 @@ main() {
 do_stages ${arch}
 [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done
-
 }
 
 main $1 &

[gentoo-commits] proj/releng:master commit in: tools-systemd/portage.arm64/package.use/, ...

2019-04-09 Thread Anthony G. Basile 
commit: 2b399a91546b22f92fd5b30e57786e786a1be9d7
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Apr 10 00:58:36 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Apr 10 01:00:07 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=2b399a91

tools-systemd: add the portage dir

Signed-off-by: Anthony G. Basile  gentoo.org>

 tools-systemd/portage.arm64/package.use/releng/iputils | 1 +
 tools-systemd/portage.arm64/package.use/releng/pam | 1 +
 tools-systemd/portage.arm64/package.use/util-linux | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools-systemd/portage.arm64/package.use/releng/iputils 
b/tools-systemd/portage.arm64/package.use/releng/iputils
new file mode 100644
index ..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.arm64/package.use/releng/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps

diff --git a/tools-systemd/portage.arm64/package.use/releng/pam 
b/tools-systemd/portage.arm64/package.use/releng/pam
new file mode 100644
index ..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.arm64/package.use/releng/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps

diff --git a/tools-systemd/portage.arm64/package.use/util-linux 
b/tools-systemd/portage.arm64/package.use/util-linux
new file mode 100644
index ..2c80720e
--- /dev/null
+++ b/tools-systemd/portage.arm64/package.use/util-linux
@@ -0,0 +1 @@
+sys-apps/util-linux static-libs

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2019-04-09 Thread Anthony G. Basile 
commit: b5afdc366e209df26c47f086dc99fa15ab38e153
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Apr  9 22:52:40 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Apr  9 22:52:57 2019 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=b5afdc36

tools-systemd: add scripts for arm64

Signed-off-by: Anthony G. Basile  gentoo.org>

 tools-systemd/run-arm64.sh | 49 ++
 1 file changed, 49 insertions(+)

diff --git a/tools-systemd/run-arm64.sh b/tools-systemd/run-arm64.sh
new file mode 100755
index ..41c4afc8
--- /dev/null
+++ b/tools-systemd/run-arm64.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+source common.sh
+
+prepare_confs() {
+  local arch=$1
+
+  for s in 1 2 3; do
+
+local cstage=stage${s}
+local p=$(( s - 1 ))
+[[ $p == 0 ]] && p=3
+local pstage=stage${p}
+local repo_dir="$( dirname $(pwd) )"
+local template="stage-all.conf.template"
+local parch="${arch}"
+
+cat ${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:@REPO_DIR@:${repo_dir}:g" \
+-e "s:MYCATALYST:$(pwd):g" \
+>  stage${s}-${arch}-systemd.conf
+  done
+}
+
+
+main() {
+  >zzz.log
+
+  undo_grsec
+
+  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+
+  for arch in arm64; do
+prepare_confs ${arch}
+  done
+
+  for arch in arm64; do
+do_stages ${arch}
+[[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
+  done
+
+}
+
+main $1 &

[gentoo-commits] proj/releng:master commit in: tools-systemd/portage.i686/package.use/, ...

2018-12-11 Thread Anthony G. Basile 
commit: 947c3e2435b6e4073bfeb6c1c91bb4b0e6e8563f
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Dec 11 22:39:32 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Dec 12 01:30:09 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=947c3e24

tools-systemd: allow some package.use entries to be removed before packing 
stage3

Signed-off-by: Anthony G. Basile  gentoo.org>

 tools-systemd/portage.amd64/package.use/{ => releng}/iputils | 0
 tools-systemd/portage.amd64/package.use/{ => releng}/pam | 0
 tools-systemd/portage.i686/package.use/{ => releng}/iputils  | 0
 tools-systemd/portage.i686/package.use/{ => releng}/pam  | 0
 tools-systemd/stage-all.conf.template| 1 +
 5 files changed, 1 insertion(+)

diff --git a/tools-systemd/portage.amd64/package.use/iputils 
b/tools-systemd/portage.amd64/package.use/releng/iputils
similarity index 100%
rename from tools-systemd/portage.amd64/package.use/iputils
rename to tools-systemd/portage.amd64/package.use/releng/iputils

diff --git a/tools-systemd/portage.amd64/package.use/pam 
b/tools-systemd/portage.amd64/package.use/releng/pam
similarity index 100%
rename from tools-systemd/portage.amd64/package.use/pam
rename to tools-systemd/portage.amd64/package.use/releng/pam

diff --git a/tools-systemd/portage.i686/package.use/iputils 
b/tools-systemd/portage.i686/package.use/releng/iputils
similarity index 100%
rename from tools-systemd/portage.i686/package.use/iputils
rename to tools-systemd/portage.i686/package.use/releng/iputils

diff --git a/tools-systemd/portage.i686/package.use/pam 
b/tools-systemd/portage.i686/package.use/releng/pam
similarity index 100%
rename from tools-systemd/portage.i686/package.use/pam
rename to tools-systemd/portage.i686/package.use/releng/pam

diff --git a/tools-systemd/stage-all.conf.template 
b/tools-systemd/stage-all.conf.template
index 2be2284f..fbfcf5eb 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -6,3 +6,4 @@ profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
 portage_confdir: MYCATALYST/portage.SARCH
+portage_prefix: releng

[gentoo-commits] proj/releng:master commit in: tools-systemd/portage.amd64/package.use/, ...

2018-06-18 Thread Anthony G. Basile 
commit: 7689550ee1abb97506de9ac118e2161d5eec1e17
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jun 18 22:31:40 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jun 18 22:31:40 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7689550e

tools-systemd: add static-libs for util-linux

 tools-systemd/portage.amd64/package.use/util-linux | 1 +
 tools-systemd/portage.i686/package.use/util-linux  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools-systemd/portage.amd64/package.use/util-linux 
b/tools-systemd/portage.amd64/package.use/util-linux
new file mode 100644
index ..2c80720e
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/util-linux
@@ -0,0 +1 @@
+sys-apps/util-linux static-libs

diff --git a/tools-systemd/portage.i686/package.use/util-linux 
b/tools-systemd/portage.i686/package.use/util-linux
new file mode 100644
index ..2c80720e
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/util-linux
@@ -0,0 +1 @@
+sys-apps/util-linux static-libs

[gentoo-commits] proj/releng:master commit in: tools-systemd/, tools-systemd/portage.i686/package.use/, ...

2018-04-28 Thread Anthony G. Basile 
commit: 6ca51d9ebebcf52984a80a6db95ab8623d95d1f3
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Apr 28 23:28:19 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Apr 28 23:28:19 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=6ca51d9e

tools-systemd: fix bug #653128

 tools-systemd/portage.amd64/package.use/iputils | 1 +
 tools-systemd/portage.amd64/package.use/pam | 1 +
 tools-systemd/portage.i686/package.use/iputils  | 1 +
 tools-systemd/portage.i686/package.use/pam  | 1 +
 tools-systemd/run.sh| 1 +
 tools-systemd/stage-all.conf.template   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/tools-systemd/portage.amd64/package.use/iputils 
b/tools-systemd/portage.amd64/package.use/iputils
new file mode 100644
index ..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps

diff --git a/tools-systemd/portage.amd64/package.use/pam 
b/tools-systemd/portage.amd64/package.use/pam
new file mode 100644
index ..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps

diff --git a/tools-systemd/portage.i686/package.use/iputils 
b/tools-systemd/portage.i686/package.use/iputils
new file mode 100644
index ..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps

diff --git a/tools-systemd/portage.i686/package.use/pam 
b/tools-systemd/portage.i686/package.use/pam
new file mode 100644
index ..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 0f16c4d1..bdaf5a4d 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -28,6 +28,7 @@ prepare_confs() {
 -e "s:SARCH:${arch}:g" \
 -e "s:PARCH:${parch}:g" \
 -e "s:@REPO_DIR@:${repo_dir}:g" \
+-e "s:MYCATALYST:$(pwd):g" \
 >  stage${s}-${arch}-systemd.conf
   done
 }

diff --git a/tools-systemd/stage-all.conf.template 
b/tools-systemd/stage-all.conf.template
index eeff0e98..2be2284f 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -5,3 +5,4 @@ rel_type: systemd/SARCH
 profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
+portage_confdir: MYCATALYST/portage.SARCH

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-03 Thread Anthony G. Basile 
commit: 92e87a5425c9645fb0e8ed6be5b12cf4c547ca67
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Mar  3 08:43:06 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Mar  3 08:43:06 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=92e87a54

tools-systemd: improve stage4 build step

 tools-systemd/common.sh | 4 +---
 tools-systemd/run.sh| 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
index d9570d05..bf52cd62 100644
--- a/tools-systemd/common.sh
+++ b/tools-systemd/common.sh
@@ -27,12 +27,10 @@ EOF
 do_stages() {
   local arch=$1
 
-  for s in 1 2 3 4; do
+  for s in 1 2 3; do
 local tgpath="${storedir}/builds/systemd/${arch}"
 local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
 local tglink="stage${s}-${arch}-systemd.tar.bz2"
-# only run the amd64 stage4
-[[ $arch == i686 ]] && [[ $s == 4 ]] && continue
 if [[ ! -f "${tgpath}/${tglink}" ]]; then
touch stage${s}-${arch}-systemd.log
echo "!!! ${tglink} at ${tgpath} doesn't exist" \

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 29869284..0f16c4d1 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -50,6 +50,8 @@ main() {
 do_stages ${arch}
 [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done
+
+  catalyst -f stage4-amd64-systemd.conf
 }
 
 main $1 &

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Anthony G. Basile 
commit: f4baf92b9ddf66119e94bc8945b10e3e935e92ad
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Mar  3 02:45:58 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Mar  3 02:45:58 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f4baf92b

tools-systemd: fix calculation of repo_dir

 tools-systemd/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 170742e3..29869284 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -13,7 +13,7 @@ prepare_confs() {
 local p=$(( s - 1 ))
 [[ $p == 0 ]] && p=3
 local pstage=stage${p}
-local repo_dir="$( cd "$( dirname ${BASH_SOURCE[0]} )../" && pwd )"
+local repo_dir="$( dirname $(pwd) )"
 local template="stage-all.conf.template"
 # set the template file if stage4
 [[ $s == 4 ]] && template=stage4-amd64.spec

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Anthony G. Basile 
commit: eaabba1bec81036b3d21a728fd3aad29d3a90635
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Mar  3 02:43:33 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Mar  3 02:43:33 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=eaabba1b

tools-systemd: fix the name of the template file

 tools-systemd/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 9066d03d..170742e3 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -16,12 +16,12 @@ prepare_confs() {
 local repo_dir="$( cd "$( dirname ${BASH_SOURCE[0]} )../" && pwd )"
 local template="stage-all.conf.template"
 # set the template file if stage4
-[[ $s == 4 ]] && specfile=stage4-amd64.spec
+[[ $s == 4 ]] && template=stage4-amd64.spec
 
 local parch="${arch}"
 [[ "${arch}" == "i686" ]] && parch="x86"
 
-cat ${specfile} | \
+cat ${template} | \
   sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
 -e "s:CSTAGE:${cstage}:g" \
 -e "s:PSTAGE:${pstage}:g" \

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Anthony G. Basile 
commit: f3fb6696b11385be2646a45ee05670618500244f
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Mar  2 16:27:08 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Mar  2 16:27:08 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f3fb6696

tools-systemd: don't do parallel runs

 tools-systemd/run.sh | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 4535883c..9066d03d 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -47,10 +47,8 @@ main() {
   # The parallelization `( do_stages ... ) &` doesn't work here
   # if catalyst is using snapcache, bug #519656
   for arch in amd64 i686; do
-(
-  do_stages ${arch}
-  [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
-) &
+do_stages ${arch}
+[[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done
 }

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Matt Thode 
commit: aa2c1085b5c4ee42eefe7fd69f7a30f94316a95e
Author: Matthew Thode  mthode  org>
AuthorDate: Fri Mar  2 16:17:20 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Mar  2 16:17:20 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=aa2c1085

add stage4 to systemd stage generation

 tools-systemd/common.sh |  7 ++--
 tools-systemd/run.sh| 11 +--
 tools-systemd/stage4-amd64.spec | 73 +
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
index 9a0a03af..d9570d05 100644
--- a/tools-systemd/common.sh
+++ b/tools-systemd/common.sh
@@ -2,7 +2,7 @@
 
 source /etc/catalyst/catalyst.conf
 
-mydate=`date +%Y%m%d`
+mydate=$(date +%Y%m%d)
 
 
 undo_grsec() {
@@ -27,11 +27,12 @@ EOF
 do_stages() {
   local arch=$1
 
-  for s in 1 2 3; do
+  for s in 1 2 3 4; do
 local tgpath="${storedir}/builds/systemd/${arch}"
 local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
 local tglink="stage${s}-${arch}-systemd.tar.bz2"
-
+# only run the amd64 stage4
+[[ $arch == i686 ]] && [[ $s == 4 ]] && continue
 if [[ ! -f "${tgpath}/${tglink}" ]]; then
touch stage${s}-${arch}-systemd.log
echo "!!! ${tglink} at ${tgpath} doesn't exist" \

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 064700fb..4535883c 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -5,22 +5,29 @@ source common.sh
 prepare_confs() {
   local arch=$1
 
-  for s in 1 2 3; do
+  for s in 1 2 3 4; do
+# don't make i686 stage4
+[[ $arch == i686 ]] && [[ $s == 4 ]] && continue
 
 local cstage=stage${s}
 local p=$(( s - 1 ))
 [[ $p == 0 ]] && p=3
 local pstage=stage${p}
+local repo_dir="$( cd "$( dirname ${BASH_SOURCE[0]} )../" && pwd )"
+local template="stage-all.conf.template"
+# set the template file if stage4
+[[ $s == 4 ]] && specfile=stage4-amd64.spec
 
 local parch="${arch}"
 [[ "${arch}" == "i686" ]] && parch="x86"
 
-cat stage-all.conf.template | \
+cat ${specfile} | \
   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:@REPO_DIR@:${repo_dir}:g" \
 >  stage${s}-${arch}-systemd.conf
   done
 }

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
new file mode 100644
index ..720fc694
--- /dev/null
+++ b/tools-systemd/stage4-amd64.spec
@@ -0,0 +1,73 @@
+subarch: SARCH
+target: CSTAGE
+version_stamp: systemd
+rel_type: systemd/SARCH
+profile: default/linux/PARCH/17.0/systemd
+snapshot: current
+source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/
+
+stage4/use:
+   bash-completion
+   bindist
+   bzip2
+   idm
+   ipv6
+   mmx
+   sse
+   sse2
+   urandom
+
+stage4/packages:
+   app-admin/sudo
+   net-misc/dhcp
+   net-misc/iputils
+   sys-boot/grub
+   sys-apps/gptfdisk
+   sys-apps/iproute2
+   sys-apps/lsb-release
+   sys-devel/bc
+   sys-power/acpid
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/rcadd:
+   acpid|default
+   net.lo|default
+   netmount|default
+   sshd|default
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-sources
+boot/kernel/gentoo/config: 
@REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/extraversion: openstack
+boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
+
+# all of the cleanup...
+stage4/unmerge:
+   sys-kernel/genkernel
+   sys-kernel/gentoo-sources
+
+stage4/empty:
+   /root/.ccache
+   /tmp
+   /usr/portage/distfiles
+   /usr/src
+   /var/cache/edb/dep
+   /var/cache/genkernel
+   /var/cache/portage/distfiles
+   /var/empty
+   /var/run
+   /var/state
+   /var/tmp
+
+stage4/rm:
+   /etc/*-
+   /etc/*.old
+   /etc/ssh/ssh_host_*
+   /root/.*history
+   /root/.lesshst
+   /root/.ssh/known_hosts
+   /root/.viminfo
+   # Remove any generated stuff by genkernel
+   /usr/share/genkernel
+   # This is 3MB of crap for each copy
+   
/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-01-21 Thread Anthony G. Basile 
commit: 12f0e45cfcd57fd4cbf7edcf2e9f8707e5c2f45e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Jan 21 19:01:01 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Jan 21 19:01:01 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=12f0e45c

tools-systemd: switch to 17.0 profiles

 tools-systemd/stage-all.conf.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-systemd/stage-all.conf.template 
b/tools-systemd/stage-all.conf.template
index 5e4cb39f..eeff0e98 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -2,6 +2,6 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
-profile: default/linux/PARCH/13.0/systemd
+profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2016-03-11 Thread Anthony G. Basile 
commit: cbfccd2c98503f66d354ca3e197de432295ece05
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Mar 11 12:21:24 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Mar 11 12:21:24 2016 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=cbfccd2c

tool-systemd: use consistent naming of script

 tools-systemd/{run-systemd.sh => run.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tools-systemd/run-systemd.sh b/tools-systemd/run.sh
similarity index 100%
rename from tools-systemd/run-systemd.sh
rename to tools-systemd/run.sh

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2016-03-09 Thread Anthony G. Basile 
commit: 4c530b61f9a5749fc57c3b784ada33f88a369744
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Mar  9 11:48:52 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Mar  9 11:48:52 2016 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=4c530b61

tools-systemd: add common.sh

 tools-systemd/common.sh | 61 +
 1 file changed, 61 insertions(+)

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
new file mode 100644
index 000..9a0a03a
--- /dev/null
+++ b/tools-systemd/common.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+source /etc/catalyst/catalyst.conf
+
+mydate=`date +%Y%m%d`
+
+
+undo_grsec() {
+  [[ -d /proc/sys/kernel/grsecurity ]] || return
+  for i in /proc/sys/kernel/grsecurity/chroot_* ; do
+echo 0 > $i
+  done
+}
+
+
+banner() {
+cat << EOF | tee -a zzz.log > stage$1-$2-systemd.log
+
+
+*stage$1-$2-systemd
+"
+
+EOF
+}
+
+
+do_stages() {
+  local arch=$1
+
+  for s in 1 2 3; do
+local tgpath="${storedir}/builds/systemd/${arch}"
+local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
+local tglink="stage${s}-${arch}-systemd.tar.bz2"
+
+if [[ ! -f "${tgpath}/${tglink}" ]]; then
+   touch stage${s}-${arch}-systemd.log
+   echo "!!! ${tglink} at ${tgpath} doesn't exist" \
+ | tee -a zzz.log \
+ > stage${s}-${arch}-systemd.err
+   return 1
+fi
+
+banner ${s} ${arch}
+catalyst -f stage${s}-${arch}-systemd.conf \
+  | tee -a zzz.log \
+  > stage${s}-${arch}-systemd.log \
+  2> stage${s}-${arch}-systemd.err
+
+if [[ -f "${tgpath}/${target}" ]]; then
+  rm -f "${tgpath}/${tglink}"
+  ln -s ${target} "${tgpath}/${tglink}"
+else
+  echo "!!! ${target} was not generated" \
+| tee -a zzz.log \
+>stage${s}-${arch}-systemd.err
+  return 1
+fi
+  done
+
+  return 0
+}

[gentoo-commits] proj/releng:master commit in: tools-systemd/

2016-03-09 Thread Anthony G. Basile 
commit: 151b14d68f31c86b08f8a99a1d6c01793562623e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Mar  9 10:02:33 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Mar  9 10:02:33 2016 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=151b14d6

tools-systemd: do parallel runs of amd64 and i686

 tools-systemd/run-systemd.sh | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools-systemd/run-systemd.sh b/tools-systemd/run-systemd.sh
index abf901e..064700f 100755
--- a/tools-systemd/run-systemd.sh
+++ b/tools-systemd/run-systemd.sh
@@ -40,8 +40,10 @@ main() {
   # The parallelization `( do_stages ... ) &` doesn't work here
   # if catalyst is using snapcache, bug #519656
   for arch in amd64 i686; do
-do_stages ${arch}
-[[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
+(
+  do_stages ${arch}
+  [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
+) &
   done
 }