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

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

[Anthony G. Basile]

commit:     f80a68d359b8230b48a9973fb00405750ae38ed9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 17:32:06 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 17:33:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=f80a68d3

tools-{musl,systemd,uclibc}: switch to nightheron

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

 tools-musl/catalyst.conf.local    | 31 +++++++++++++++++++++++++++++++
 tools-musl/common.sh              |  5 +++--
 tools-musl/run.sh                 |  2 +-
 tools-systemd/.gitignore          |  3 +++
 tools-systemd/catalyst.conf.local | 31 +++++++++++++++++++++++++++++++
 tools-systemd/common.sh           |  5 +++--
 tools-systemd/run.sh              |  2 +-
 tools-uclibc/.gitignore           |  1 +
 tools-uclibc/catalyst.conf.local  | 31 +++++++++++++++++++++++++++++++
 tools-uclibc/common.sh            |  5 +++--
 tools-uclibc/run.sh               |  2 +-
 11 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/tools-musl/catalyst.conf.local b/tools-musl/catalyst.conf.local
new file mode 100644
index 00000000..f561a17b
--- /dev/null
+++ b/tools-musl/catalyst.conf.local
@@ -0,0 +1,31 @@
+# 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="/usr"
+repo_name="portage"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
+
+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-musl/common.sh b/tools-musl/common.sh
index 2420b85d..67481bbd 100644
--- a/tools-musl/common.sh
+++ b/tools-musl/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /etc/catalyst/catalyst.conf
+source $(pwd)/catalyst.conf.local
 
 mydate=`date +%Y%m%d`
 
@@ -42,7 +42,8 @@ do_stages() {
     fi
 
     banner ${s} ${arch} ${flavor}
-    catalyst -f stage${s}-${arch}-musl-${flavor}.conf \
+    catalyst -c $(pwd)/catalyst.conf.local \
+      -f stage${s}-${arch}-musl-${flavor}.conf \
       | tee -a zzz.log \
       > stage${s}-${arch}-musl-${flavor}.log \
       2> stage${s}-${arch}-musl-${flavor}.err

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index c3065958..f5e56f5a 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -49,7 +49,7 @@ main() {
 
   undo_grsec
 
-  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+  catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in amd64 i686; do
     for flavor in hardened vanilla; do

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

diff --git a/tools-systemd/catalyst.conf.local b/tools-systemd/catalyst.conf.local
new file mode 100644
index 00000000..f561a17b
--- /dev/null
+++ b/tools-systemd/catalyst.conf.local
@@ -0,0 +1,31 @@
+# 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="/usr"
+repo_name="portage"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
+
+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/common.sh b/tools-systemd/common.sh
index bf52cd62..60aac2a2 100644
--- a/tools-systemd/common.sh
+++ b/tools-systemd/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /etc/catalyst/catalyst.conf
+source $(pwd)/catalyst.conf.local
 
 mydate=$(date +%Y%m%d)
 
@@ -40,7 +40,8 @@ do_stages() {
     fi
 
     banner ${s} ${arch}
-    catalyst -f stage${s}-${arch}-systemd.conf \
+    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

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 057a06f4..1a1a9200 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -42,7 +42,7 @@ main() {
 
   undo_grsec
 
-  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+  catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in amd64 i686; do
     prepare_confs ${arch}

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

diff --git a/tools-uclibc/catalyst.conf.local b/tools-uclibc/catalyst.conf.local
new file mode 100644
index 00000000..f561a17b
--- /dev/null
+++ b/tools-uclibc/catalyst.conf.local
@@ -0,0 +1,31 @@
+# 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="/usr"
+repo_name="portage"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
+
+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-uclibc/common.sh b/tools-uclibc/common.sh
index d1350d25..b95b0643 100644
--- a/tools-uclibc/common.sh
+++ b/tools-uclibc/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /etc/catalyst/catalyst.conf
+source $(pwd)/catalyst.conf.local
 
 mydate=`date +%Y%m%d`
 
@@ -42,7 +42,8 @@ do_stages() {
     fi
 
     banner ${s} ${arch} ${flavor}
-    catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \
+    catalyst -c $(pwd)/catalyst.conf.local \
+      -f stage${s}-${arch}-uclibc-${flavor}.conf \
       | tee -a zzz.log \
       > stage${s}-${arch}-uclibc-${flavor}.log \
       2> stage${s}-${arch}-uclibc-${flavor}.err

diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh
index cdc0def9..cb4221e2 100755
--- a/tools-uclibc/run.sh
+++ b/tools-uclibc/run.sh
@@ -45,7 +45,7 @@ main() {
 
 #  undo_grsec
 
-  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+  catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in amd64 i686; do
     for flavor in hardened vanilla; do

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

[Anthony G. Basile]

commit:     c14cd7737367cc6af1991566945f0fda8776d330
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 23:27:25 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 23:27:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c14cd773

tools-{musl,systemd,uclibc}: fix PORTDIR and friends

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

 tools-musl/catalyst.conf.local    | 8 ++++----
 tools-systemd/catalyst.conf.local | 8 ++++----
 tools-uclibc/catalyst.conf.local  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools-musl/catalyst.conf.local b/tools-musl/catalyst.conf.local
index f561a17b..91d3c926 100644
--- a/tools-musl/catalyst.conf.local
+++ b/tools-musl/catalyst.conf.local
@@ -15,10 +15,10 @@ options="autoresume bindist kerncache pkgcache seedcache"
 
 portdir="/usr/portage"
 
-repo_basedir="/usr"
-repo_name="portage"
-target_distdir="/usr/portage/distfiles"
-target_pkgdir="/usr/portage/packages"
+repo_basedir="/var/db/repos"
+repo_name="gentoo"
+target_distdir="/var/cache/distfiles"
+target_pkgdir="/var/cache/binpkgs"
 
 sharedir="/usr/share/catalyst"
 

diff --git a/tools-systemd/catalyst.conf.local b/tools-systemd/catalyst.conf.local
index f561a17b..91d3c926 100644
--- a/tools-systemd/catalyst.conf.local
+++ b/tools-systemd/catalyst.conf.local
@@ -15,10 +15,10 @@ options="autoresume bindist kerncache pkgcache seedcache"
 
 portdir="/usr/portage"
 
-repo_basedir="/usr"
-repo_name="portage"
-target_distdir="/usr/portage/distfiles"
-target_pkgdir="/usr/portage/packages"
+repo_basedir="/var/db/repos"
+repo_name="gentoo"
+target_distdir="/var/cache/distfiles"
+target_pkgdir="/var/cache/binpkgs"
 
 sharedir="/usr/share/catalyst"
 

diff --git a/tools-uclibc/catalyst.conf.local b/tools-uclibc/catalyst.conf.local
index f561a17b..91d3c926 100644
--- a/tools-uclibc/catalyst.conf.local
+++ b/tools-uclibc/catalyst.conf.local
@@ -15,10 +15,10 @@ options="autoresume bindist kerncache pkgcache seedcache"
 
 portdir="/usr/portage"
 
-repo_basedir="/usr"
-repo_name="portage"
-target_distdir="/usr/portage/distfiles"
-target_pkgdir="/usr/portage/packages"
+repo_basedir="/var/db/repos"
+repo_name="gentoo"
+target_distdir="/var/cache/distfiles"
+target_pkgdir="/var/cache/binpkgs"
 
 sharedir="/usr/share/catalyst"