* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-12-09 15:19 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-12-09 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 4736f92567dc16e8a6b3a4d8db2895448f6cafc2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 15:19:25 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 15:19:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4736f925
scripts/auto-bootstraps/dobootstrap: sanitize linux version a bit
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 5970ecb540..9ef644be2c 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -140,6 +140,9 @@ do_prepare() {
# UNIX vendors
local dist=$(lsb_release -si)
local rel=$(lsb_release -sr)
+ while [[ ${rel} == *.*.* ]] ; do
+ rel=${rel%.*}
+ done
local platform=pc
# this is the logic used in bootstrap-prefix.sh
[[ ${PREFIX_DISABLE_RAP} != "yes" ]] && platform=rap
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-06-16 7:47 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-06-16 7:47 UTC (permalink / raw
To: gentoo-commits
commit: e34da1c7f864215e4171d1597e1d21bdc2a63655
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 07:46:41 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 07:46:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e34da1c7
scripts/auto-bootstraps/analyse_result: fix syntax warning
this probably changed inbetween a Python release or two
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 4 ++--
scripts/auto-bootstraps/dobootstrap | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 5314d66593..428a110f2f 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -218,10 +218,10 @@ def archSort(l, r):
Sort by os, vendor, cpu
"""
lcpu, lvendor, los = l.split('-', 2)
- losname = re.split('\d', los, 1)[0]
+ losname = re.split('[0-9]', los, 1)[0]
losver = los.split(losname, 1)[1]
rcpu, rvendor, ros = r.split('-', 2)
- rosname = re.split('\d', ros, 1)[0]
+ rosname = re.split('[0-9]', ros, 1)[0]
rosver = ros.split(rosname, 1)[1]
if losname > rosname:
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index cafd4df1fa..682a7927d9 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -88,7 +88,7 @@ do_prepare() {
chost=sparc-${chost#*-}
fi
;;
- SParcv9-*|sparc64-*)
+ sparcv9-*|sparc64-*)
if [[ ${bitw} == 32 ]] ; then
chost=sparc-${chost#*-}
else
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-04-05 15:09 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-04-05 15:09 UTC (permalink / raw
To: gentoo-commits
commit: ebb0a9e25b78000c8f2e47c4559014c92e88e2b4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 5 15:08:49 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 15:08:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ebb0a9e2
scripts/auto-bootstraps/dobootstrap: fix shellcheck fix
previous fix included some quotes in the output, making no sense and
failing portage down the line
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index b79d42060f..cafd4df1fa 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -132,7 +132,7 @@ do_prepare() {
USER="${USER}" \
CHOST="${chost}" \
EPREFIX="${EPREFIX}" \
- ${GENTOO_MIRRORS+GENTOO_MIRRORS=\""${GENTOO_MIRRORS}"\"} \
+ ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-04-05 11:45 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-04-05 11:45 UTC (permalink / raw
To: gentoo-commits
commit: bb9c656be46db918063c92c09391a1c952cea61d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 5 11:44:19 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 11:45:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bb9c656b
scripts/auto-bootstraps/dobootstrap: unbreak after shellcheck
the quoting-eagerness of shellcheck isn't always resulting in the
desired output, in this case quoted empty strings broke where they
previously would be ignored as whitespace separators
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index f2b670d9b2..b79d42060f 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -127,20 +127,20 @@ do_prepare() {
starttime=${SECONDS}
env -i \
HOME="${EPREFIX}" \
- SHELL=/bin/sh \
+ SHELL="/bin/sh" \
TERM="${TERM}" \
USER="${USER}" \
CHOST="${chost}" \
EPREFIX="${EPREFIX}" \
- ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
+ ${GENTOO_MIRRORS+GENTOO_MIRRORS=\""${GENTOO_MIRRORS}"\"} \
${DOLOCAL+DOLOCAL=1} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
- ${TREE_FROM_SRC+TREE_FROM_SRC=}"${TREE_FROM_SRC}" \
- ${USE_CPU_CORES+USE_CPU_CORES=}"${USE_CPU_CORES}" \
- ${DARWIN_USE_GCC+DARWIN_USE_GCC=}"${DARWIN_USE_GCC}" \
- ${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP=}"${PREFIX_DISABLE_RAP}" \
- ${BP_KEEPALIVE_ACTIVE+BP_KEEPALIVE_ACTIVE=}"${BP_KEEPALIVE_ACTIVE}" \
+ ${TREE_FROM_SRC+TREE_FROM_SRC="${TREE_FROM_SRC}"} \
+ ${USE_CPU_CORES+USE_CPU_CORES="${USE_CPU_CORES}"} \
+ ${DARWIN_USE_GCC+DARWIN_USE_GCC="${DARWIN_USE_GCC}"} \
+ ${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP="${PREFIX_DISABLE_RAP}"} \
+ ${BP_KEEPALIVE_ACTIVE+BP_KEEPALIVE_ACTIVE="${BP_KEEPALIVE_ACTIVE}"} \
"${BASH}" "${bootstrapscript}" bootstrap
endtime=${SECONDS}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-04-02 17:31 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-04-02 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 643ab6c4370c2d3f79a4828b45ad7bb68c8fce01
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 17:30:53 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 17:31:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=643ab6c4
scripts/auto-bootstraps/process_uploads: allow processing of temp files too
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/process_uploads.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
index 8a71d296a4..8e51f7c992 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -62,8 +62,10 @@ for d in "${UPLOADDIR}"/* ; do
mkdir -p "${RESULTSDIR}/${w}"
[[ -e "${pkg}"/build-info ]] && \
mv "${pkg}"/build-info "${RESULTSDIR}/${w}"/
- [[ -e "${pkg}"/temp ]] && \
+ if [[ -e "${pkg}"/temp ]] ; then
mv "${pkg}"/temp "${RESULTSDIR}/${w}"/
+ process_file "${RESULTSDIR}/${w}"/temp
+ fi
done
fi
chmod -R o+rX,go-w "${RESULTSDIR}/${dir}"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-03-30 12:13 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-03-30 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 198171d5f421bdf77b91f1acf9830690fa69fb12
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 11:59:03 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 11:59:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=198171d5
scripts/auto-bootstraps/process_uploads: silence SC1091
the local script being sourced is supposed for local instance overrides,
and thus not available in the tree
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/process_uploads.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
index fae40dddef..8a71d296a4 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+#shellcheck disable=SC1091
UPLOADDIR="./uploads"
RESULTSDIR="./results"
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-03-28 16:12 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-03-28 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 2de7386aef93884137d5700d56046f360546b250
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 14:45:12 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 14:45:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2de7386a
auto-bootstraps/process_uploads: shellcheck
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/process_uploads.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
index dc858589a8..fae40dddef 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -4,7 +4,7 @@ UPLOADDIR="./uploads"
RESULTSDIR="./results"
if [[ -x ${BASH_SOURCE[0]%/*}/process_uploads_local.sh ]] ; then
- source ${BASH_SOURCE[0]%/*}/process_uploads_local.sh
+ source "${BASH_SOURCE[0]%/*}"/process_uploads_local.sh
fi
if [[ $(type -t process_file) != function ]] ; then
@@ -14,7 +14,7 @@ if [[ $(type -t process_file) != function ]] ; then
fi
didsomething=
-for d in ${UPLOADDIR}/* ; do
+for d in "${UPLOADDIR}"/* ; do
if [[ ! -d "${d}" ]] ; then
rm -f "${d}"
continue
@@ -28,7 +28,7 @@ for d in ${UPLOADDIR}/* ; do
continue
fi
- dir=${1#${d}/}
+ dir=${1#"${d}"/}
# skip this thing from auto-processing if it is new platform
[[ -d ${RESULTSDIR}/${dir%/*} ]] || continue
# skip this thing if it already exists
@@ -57,7 +57,7 @@ for d in ${UPLOADDIR}/* ; do
if [[ -e "${d}/${dir}/portage" ]] ; then
for pkg in "${d}/${dir}/portage"/*/* ; do
[[ -e ${pkg} ]] || continue
- w=${pkg#${d}/}
+ w=${pkg#"${d}"/}
mkdir -p "${RESULTSDIR}/${w}"
[[ -e "${pkg}"/build-info ]] && \
mv "${pkg}"/build-info "${RESULTSDIR}/${w}"/
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-03-02 12:57 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-03-02 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 2389f54d75dab39a49fe530736081b0cf2b54972
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 12:56:59 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 12:57:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2389f54d
scripts/auto-bootstraps: deprecate x86-darwin9, fix CHOST reporting
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 1 +
scripts/auto-bootstraps/dobootstrap | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 094462a1dc..5314d66593 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -10,6 +10,7 @@ from functools import cmp_to_key
resultsdir='./results'
deprecated_archs = (
+ 'i386-apple-darwin9',
'x86_64-pc-cygwin',
'i386-pc-solaris2.11',
'sparc-sun-solaris2.10',
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 45b37c5211..14cc137a0d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -146,7 +146,8 @@ do_prepare() {
echo $((endtime - starttime)) > elapsedtime
# get identification of host that includes Linux distro, RAP, ...
- chost=$(${BASH} ./bootstrap-prefix.sh chost.identify x)
+ chost=$(env CHOST=${chost} \
+ ${BASH} ./bootstrap-prefix.sh chost.identify x)
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-02-24 9:10 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-02-24 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 7ebdd7c8577d15d7ddb31cd1cdc49d0fe715ad27
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 09:09:15 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:10:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7ebdd7c8
scripts/auto-bootstraps/process_uploads: add local processing hook
log cleansing and distfile caching/processing is specific to the local
setup, allow to hook it in
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/process_uploads.sh | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
index ca39789510..dc858589a8 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -3,6 +3,16 @@
UPLOADDIR="./uploads"
RESULTSDIR="./results"
+if [[ -x ${BASH_SOURCE[0]%/*}/process_uploads_local.sh ]] ; then
+ source ${BASH_SOURCE[0]%/*}/process_uploads_local.sh
+fi
+
+if [[ $(type -t process_file) != function ]] ; then
+ process_file() {
+ return
+ }
+fi
+
didsomething=
for d in ${UPLOADDIR}/* ; do
if [[ ! -d "${d}" ]] ; then
@@ -30,17 +40,19 @@ for d in ${UPLOADDIR}/* ; do
# behind
mkdir "${RESULTSDIR}/${dir}"
for f in \
+ distfiles \
stage{1,2,3}.log \
.stage{1,2,3}-finished \
bootstrap-prefix.sh \
emerge.log \
startprefix \
elapsedtime \
- make.conf \
- distfiles ;
+ make.conf ;
do
- [[ -e "${d}/${dir}/${f}" ]] && \
+ if [[ -e "${d}/${dir}/${f}" ]] ; then
mv "${d}/${dir}/${f}" "${RESULTSDIR}/${dir}"/
+ process_file "${RESULTSDIR}/${dir}/${f}"
+ fi
done
if [[ -e "${d}/${dir}/portage" ]] ; then
for pkg in "${d}/${dir}/portage"/*/* ; do
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-02-05 11:54 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-02-05 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 99a538389cc34a6b2466720c8d1925ee27bce5dc
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 11:53:49 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 11:54:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=99a53838
scripts/auto-bootstraps/analyse_result: detect recent snapshot names
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index b12c849bbe..094462a1dc 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -188,8 +188,8 @@ with os.scandir(resultsdir) as it:
if 'Fetching ' in x:
if 'portage-latest.tar.bz2' in x:
snapshot = 'latest'
- elif 'prefix-overlay-' in x:
- snapshot = re.split('[-.]', x)[2]
+ elif re.search(r'(prefix-overlay|portage)-\d{8}\.tar\.bz2', x) is not None:
+ snapshot = x.split('.')[0].split('-')[-1]
elif 'total size is' in x:
snapshot = 'rsync'
elif 'Darwin with GCC toolchain' in x:
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-01-29 18:59 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-01-29 18:59 UTC (permalink / raw
To: gentoo-commits
commit: e0241cdfdf60a53475e57214d5275f899085f535
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 18:58:40 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 18:58:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e0241cdf
scripts/auto-bootstraps/dobootstrap: fix match for Darwin 8/9
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 60ed9b69ea..45b37c5211 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -39,7 +39,7 @@ do_prepare() {
local chost=$(${BASH} ${bootstrap} chost.guess x)
case ${chost} in
- powerpc*-*darwin[89])
+ *-darwin[89])
# ppc64-darwin never really worked for unknown reasons
# darwin9 (Leopard) doesn't work on Intel either
bitw=32
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-01-15 10:37 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-01-15 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 717323771eaebf6430987aa366578f0f42b87258
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 10:36:53 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 10:37:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=71732377
scripts/auto-bootstraps/analyse_result: mark all Darwin 22 as "old"
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index df4ffa03d9..b12c849bbe 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -19,6 +19,7 @@ deprecated_archs = (
'x86_64-apple-darwin19',
'x86_64-apple-darwin20',
'x86_64-apple-darwin21',
+ 'x86_64-apple-darwin22',
'arm64-apple-darwin21',
'arm64-apple-darwin22',
'x86_64-pc-linux-centos8.3',
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-01-14 10:48 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-01-14 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 2fed10c4896e35b7ffa0f3235b213538deae6f7f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:48:07 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 10:48:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2fed10c4
scripts/auto-bootstraps/update_distfiles.py: fix syntax error
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/update_distfiles.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/update_distfiles.py b/scripts/auto-bootstraps/update_distfiles.py
index c8578a075d..33b5ed2065 100755
--- a/scripts/auto-bootstraps/update_distfiles.py
+++ b/scripts/auto-bootstraps/update_distfiles.py
@@ -19,7 +19,7 @@ for path in sys.argv[1:]:
if not f.is_file() or f.name.startswith('.'):
continue
# ensure this live snapshot never ends up in a mirror
- if (f.name.startswith('portage-latest.tar.'):
+ if f.name.startswith('portage-latest.tar.'):
continue
srcfile = os.path.join(path, f.name)
h = hash_file(srcfile)
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-01-14 10:46 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-01-14 10:46 UTC (permalink / raw
To: gentoo-commits
commit: 02f3aa274e132ac4e78423361e9e82da765d11c6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:45:29 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 10:46:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=02f3aa27
scripts/auto-bootstraps/dobootstrap: handle unfetchable bootstrap script
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 983cf65977..c237433034 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -31,7 +31,8 @@ do_prepare() {
bootstrap=${OVERRIDE_EPREFIX:-bootstrap${bitw}-${dte}}/bootstrap-prefix.sh
elif [[ -n ${DOLOCAL} ]] ; then
bootstrap=${BOOTSTRAP}
- else
+ fi
+ if [[ ! -e ${bootstrap} ]] ; then
bootstrap=dobootstrap-do_prepare-$$
do_fetch ${BOOTURL} > ${bootstrap}
fi
@@ -144,7 +145,7 @@ do_prepare() {
echo $((endtime - starttime)) > elapsedtime
# get identification of host that includes Linux distro, RAP, ...
- chost=$(${BASH} ${bootstrap} chost.identify x)
+ chost=$(${BASH} ./bootstrap-prefix.sh chost.identify x)
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
@@ -200,7 +201,7 @@ case $1 in
;;
*)
bitw=
- if [[ ${0} == /net/* ]] ; then
+ if [[ ${0} == /net/* || ${0} == /System/* ]] ; then
echo "internal host, activating local and DOPUBLISH"
export DOLOCAL=1
export DOPUBLISH=1
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2024-01-14 10:46 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2024-01-14 10:46 UTC (permalink / raw
To: gentoo-commits
commit: 584767517bffb73566292dabe27ab7ba679b8892
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:38:16 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 10:46:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=58476751
scripts/auto-bootstraps/analyse_result.py: deprecate arm64-darwin21
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 5281a859eb..df4ffa03d9 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -20,6 +20,7 @@ deprecated_archs = (
'x86_64-apple-darwin20',
'x86_64-apple-darwin21',
'arm64-apple-darwin21',
+ 'arm64-apple-darwin22',
'x86_64-pc-linux-centos8.3',
'x86_64-pc-linux-ubuntu16.04',
'x86_64-rap-linux-ubuntu16.04',
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-08-31 6:36 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-08-31 6:36 UTC (permalink / raw
To: gentoo-commits
commit: 85746654ac4a284323d36cf8d8d3ce4dc5c08abf
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 06:35:29 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 06:35:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=85746654
scripts/auto-bootstraps/update_distfiles: skip portage-latest.tar.*
Bit of a kludge, but avoid portage-latest.tar.* to be made public, so as
not to serve an outdated copy.
Bug: https://bugs.gentoo.org/913349
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/update_distfiles.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/auto-bootstraps/update_distfiles.py b/scripts/auto-bootstraps/update_distfiles.py
index 76d3da64df..c8578a075d 100755
--- a/scripts/auto-bootstraps/update_distfiles.py
+++ b/scripts/auto-bootstraps/update_distfiles.py
@@ -18,6 +18,9 @@ for path in sys.argv[1:]:
for f in it:
if not f.is_file() or f.name.startswith('.'):
continue
+ # ensure this live snapshot never ends up in a mirror
+ if (f.name.startswith('portage-latest.tar.'):
+ continue
srcfile = os.path.join(path, f.name)
h = hash_file(srcfile)
distname = os.path.join(distfilessrc,
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-06-20 9:08 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-06-20 9:08 UTC (permalink / raw
To: gentoo-commits
commit: aa3d6432c1873724da1084a27ae3c7acfc00e186
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 08:38:18 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 08:38:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aa3d6432
scripts/auto-bootstraps: deprecate non/old-LTS ubuntu
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index bd925b9eed..5281a859eb 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -21,6 +21,9 @@ deprecated_archs = (
'x86_64-apple-darwin21',
'arm64-apple-darwin21',
'x86_64-pc-linux-centos8.3',
+ 'x86_64-pc-linux-ubuntu16.04',
+ 'x86_64-rap-linux-ubuntu16.04',
+ 'x86_64-rap-linux-ubuntu18.04',
)
def find_last_stage(d):
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-06-20 8:34 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-06-20 8:34 UTC (permalink / raw
To: gentoo-commits
commit: 6ffff6a3ab6fe114cc20209194a286d2c3752547
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 08:33:49 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 08:34:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6ffff6a3
scripts/auto-bootstraps: deprecate x86_64-pc-linux-centos8.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index d5cedf977f..bd925b9eed 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -20,6 +20,7 @@ deprecated_archs = (
'x86_64-apple-darwin20',
'x86_64-apple-darwin21',
'arm64-apple-darwin21',
+ 'x86_64-pc-linux-centos8.3',
)
def find_last_stage(d):
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-05-31 9:19 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-05-31 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 77f0802a3c4de947f1cd0603601fa3c8416b2149
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 09:19:51 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 31 09:19:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=77f0802a
scripts/dobootstrap: force bitwidth to supported configs
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index de1a371627..8b8eb48bed 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -37,6 +37,17 @@ do_prepare() {
fi
local chost=$(${BASH} ${bootstrap} chost.guess x)
+ case ${chost} in
+ powerpc*-*darwin*)
+ # ppc64-darwin never really worked for unknown reasons
+ bitw=32
+ ;;
+ *-solaris*|*-darwin*)
+ # force 64-bits for these targets, 32-bits is no longer
+ # supported
+ bitw=64
+ ;;
+ esac
case ${chost} in
*86-*)
if [[ ${bitw} == 64 ]] ; then
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-05-30 6:01 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-05-30 6:01 UTC (permalink / raw
To: gentoo-commits
commit: 9d136a6e5c59df93e1249cbb5d7d5b5144791c37
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 06:01:22 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 30 06:01:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9d136a6e
scripts/dobootstrap: keep fallback mirrors
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index b2495c4d7d..de1a371627 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -222,7 +222,7 @@ case $1 in
echo "internal host, activating local and DOPUBLISH"
export DOLOCAL=1
export DOPUBLISH=1
- export GENTOO_MIRRORS="http://distfileslocal"
+ export GENTOO_MIRRORS="http://distfileslocal http://distfiles.gentoo.org"
fi
for arg in "${@:1}" ; do
case "${arg}" in
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-05-26 14:33 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-05-26 14:33 UTC (permalink / raw
To: gentoo-commits
commit: f7602a3ce9e82fbfbcfb61866f68827931437914
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:33:30 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:33:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7602a3c
scripts/auto-bootstraps/analyse_result: deprecate some more targets
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index a131dfc848..d5cedf977f 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -11,10 +11,15 @@ resultsdir='./results'
deprecated_archs = (
'x86_64-pc-cygwin',
+ 'i386-pc-solaris2.11',
'sparc-sun-solaris2.10',
'sparcv9-sun-solaris2.10',
'sparc-sun-solaris2.11',
- 'sparcv9-sun-solaris2.11'
+ 'sparcv9-sun-solaris2.11',
+ 'x86_64-apple-darwin19',
+ 'x86_64-apple-darwin20',
+ 'x86_64-apple-darwin21',
+ 'arm64-apple-darwin21',
)
def find_last_stage(d):
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2023-05-26 14:30 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2023-05-26 14:30 UTC (permalink / raw
To: gentoo-commits
commit: af1392f6912caa84e8d47a1b5b4814dd95946f82
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:29:59 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:30:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=af1392f6
scripts/auto-bootstraps/dobootstrap: detect musl
this doesn't make a bootstrap work on musl-based systems
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index b4042a66e0..b2495c4d7d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -133,7 +133,7 @@ do_prepare() {
echo $((endtime - starttime)) > elapsedtime
# massage CHOST on Linux systems
- if [[ ${chost} == *-linux-gnu* ]] ; then
+ if [[ ${chost} == *-linux-* ]] ; then
# two choices here: x86_64_ubuntu16-linux-gnu
# x86_64-pc-linux-ubuntu16
# I choose the latter because it is compatible with most
@@ -148,7 +148,10 @@ do_prepare() {
# Gentoo's versioning isn't really relevant, since it is
# a rolling distro
- [[ ${dist,,} == "gentoo" ]] && rel=
+ if [[ ${dist,,} == "gentoo" ]] ; then
+ rel=
+ [[ ${chost##*-} == "musl" ]] && rel="musl"
+ fi
fi
[[ -z ${dist} ]] && dist=linux
# leave rel unset/empty if we don't know about it
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2022-05-31 11:10 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2022-05-31 11:10 UTC (permalink / raw
To: gentoo-commits
commit: bc2b43acff4bb72ccd97324496d7f8b05f209167
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 11:10:09 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 31 11:10:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bc2b43ac
scripts/auto-bootstraps/dobootstrap: do some more guessing for Linux systems
try to deal with missing lsb_release, add case for Gentoo systems not to
include a "release"
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index fd9bd75dd0..b4042a66e0 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -140,6 +140,18 @@ do_prepare() {
# UNIX vendors
local dist=$(lsb_release -si)
local rel=$(lsb_release -sr)
+ if [[ -z ${dist} ]] || [[ -z ${rel} ]] ; then
+ source /etc/os-release # this may fail if the file isn't there
+ [[ -z ${dist} ]] && dist=${NAME}
+ [[ -z ${dist} ]] && dist=${ID}
+ [[ -z ${rel} ]] && rel=${VERSION_ID}
+
+ # Gentoo's versioning isn't really relevant, since it is
+ # a rolling distro
+ [[ ${dist,,} == "gentoo" ]] && rel=
+ fi
+ [[ -z ${dist} ]] && dist=linux
+ # leave rel unset/empty if we don't know about it
while [[ ${rel} == *.*.* ]] ; do
rel=${rel%.*}
done
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2022-05-31 9:16 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2022-05-31 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 4fb00ba05ef9f90ad5b6d3bf947a4a7ea7ffff29
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 09:16:14 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 31 09:16:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4fb00ba0
scripts/auto-bootstraps/dobootstrap: allow aarch64-* CHOST
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index a38d88e6bc..fd9bd75dd0 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -62,7 +62,7 @@ do_prepare() {
chost=powerpc-${chost#*-}
fi
;;
- arm64-*)
+ aarch64-*|arm64-*)
bitw=64
;;
sparc-*)
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-12-30 12:25 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-12-30 12:25 UTC (permalink / raw
To: gentoo-commits
commit: a3c3692b618794059303e020aecb054836ec9e57
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 12:25:09 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 12:25:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a3c3692b
scripts/auto-bootstraps/analyse_result: deprecate sparc-solaris
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index f15bffc9da..a131dfc848 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -12,7 +12,9 @@ resultsdir='./results'
deprecated_archs = (
'x86_64-pc-cygwin',
'sparc-sun-solaris2.10',
- 'sparcv9-sun-solaris2.10'
+ 'sparcv9-sun-solaris2.10',
+ 'sparc-sun-solaris2.11',
+ 'sparcv9-sun-solaris2.11'
)
def find_last_stage(d):
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-12-07 8:35 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-12-07 8:35 UTC (permalink / raw
To: gentoo-commits
commit: d8272847ef13019470eb7be28cf4cce985b8f4eb
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 08:34:58 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 08:34:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d8272847
scripts/auto-bootstraps/analyse_result: deal with make.conf dir
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 23ff06c5f5..f15bffc9da 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -150,13 +150,22 @@ with os.scandir(resultsdir) as it:
elapsedtime = int(l)
mconf = os.path.join(resultsdir, arch, "%s" % d, "make.conf")
- if os.path.exists(mconf):
- with open(mconf, 'rb') as f:
- l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
- l = list(filter(lambda x: 'USE=' in x, l))
- for x in l:
- if 'libressl' in x:
- haslssl = True
+ conffiles = []
+ if os.path.isdir(mconf):
+ with os.scandir(mconf) as it:
+ for f in it:
+ if f.is_file():
+ conffiles += [ f.name ]
+ else:
+ conffiles = [ mconf ]
+ for mconf in conffiles:
+ if os.path.exists(mconf):
+ with open(mconf, 'rb') as f:
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
+ l = list(filter(lambda x: 'USE=' in x, l))
+ for x in l:
+ if 'libressl' in x:
+ haslssl = True
mconf = os.path.join(resultsdir, arch, "%s" % d, "stage1.log")
if os.path.exists(mconf):
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-02-20 14:19 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-02-20 14:19 UTC (permalink / raw
To: gentoo-commits
commit: b6bf14b92f884e30ad8b781d887b86828f70b557
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 14:18:25 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 14:18:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b6bf14b9
scripts/auto-bootstraps/dobootstrap: recognise arm64-macos
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 636c12688b..a38d88e6bc 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -62,6 +62,9 @@ do_prepare() {
chost=powerpc-${chost#*-}
fi
;;
+ arm64-*)
+ bitw=64
+ ;;
sparc-*)
if [[ ${bitw} == 64 ]] ; then
chost=sparcv9-${chost#*-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-02-05 17:48 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-02-05 17:48 UTC (permalink / raw
To: gentoo-commits
commit: de8c1045d546ab6cb393ec6a08b2aaff347f1664
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 10:03:23 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 10:03:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=de8c1045
scripts/auto-bootstraps/dobootstrap: drop libressl bootstrap support
libressl is going away, so don't support new bootstraps for it anymore
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 50b550f0ba..dec21808ad 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -109,7 +109,8 @@ do_prepare() {
keepalive=$(type -P caffeinate)
[[ -x ${keepalive} ]] && keepalive+=" -i -m -s" || keepalive=
- local libressluse="libressl -curl_ssl_openssl curl_ssl_libressl"
+ # reminder: MAKE_CONF_ADDITIONAL_USE can be set to add global
+ # USE-flags in make.conf prior to stage2 (first emerge usage)
starttime=${SECONDS}
env -i \
HOME=${EPREFIX} \
@@ -120,7 +121,6 @@ do_prepare() {
EPREFIX=${EPREFIX} \
${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
- ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE="${libressluse}"} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
@@ -199,7 +199,6 @@ case $1 in
fi
for arg in "${@:1}" ; do
case "${arg}" in
- libressl) export DOLIBRESSL=1 ;;
latesttree) export LATEST_TREE_YES=1 ;;
norap|no-rap) export PREFIX_DISABLE_RAP=yes ;;
32|64) bitw=${arg} ;;
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-01-17 18:42 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-01-17 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 01d4112bb280246c420c7929f63eb2051556de52
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 18:41:39 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 18:42:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=01d4112b
scripts/auto-bootstraps/analyse_result: hide some inactive targets
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 38 +++++++++++++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 459341c8c7..23ff06c5f5 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -9,6 +9,12 @@ from functools import cmp_to_key
resultsdir='./results'
+deprecated_archs = (
+ 'x86_64-pc-cygwin',
+ 'sparc-sun-solaris2.10',
+ 'sparcv9-sun-solaris2.10'
+)
+
def find_last_stage(d):
"""
Returns the last stage worked on.
@@ -238,9 +244,13 @@ display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: upp
return tags
# generate html edition
+deprecated_count = 0
with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<html>")
- h.write("<head><title>Gentoo Prefix bootstrap results</title></head>")
+ h.write("<head>")
+ h.write("<meta charset='UTF-8'>")
+ h.write("<title>Gentoo Prefix bootstrap results</title>")
+ h.write("</head>")
h.write("<body>")
h.write("<h2>Gentoo Prefix bootstraps</h2>")
h.write('<table border="1px">')
@@ -256,7 +266,11 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
else:
state = 'limegreen'
- h.write('<tr>')
+ if arch in deprecated_archs:
+ deprecated_count = deprecated_count + 1
+ h.write('<tr id="deprecated_%d" style="display: none;">' % deprecated_count)
+ else:
+ h.write('<tr>')
h.write('<td bgcolor="%s" nowrap="nowrap">' % state)
h.write(arch)
@@ -294,6 +308,26 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("</tr>")
h.write("</table>")
+ h.write('''
+<script type="text/javascript"><!--
+ function toggle_hidden(id) {
+ var e = document.getElementById(id);
+ if (!e)
+ return;
+ if (e.style.display == 'none')
+ e.style.display = 'table-row';
+ else
+ e.style.display = 'none';
+ }
+ function toggle_all() {
+''')
+ for i in range(deprecated_count):
+ h.write("toggle_hidden('deprecated_%d');" % (i + 1))
+ h.write('''
+ }
+ //-->
+</script>''')
+ h.write("<a href='#' onclick='toggle_all();'>toggle visibility for %d deprecated arches</a>" % deprecated_count)
now = time.strftime('%Y-%m-%dT%H:%MZ', time.gmtime())
h.write("<p><i>generated: %s</i></p>" % now)
h.write("<p>See also <a href='https://dev.azure.com/12719821/12719821/_build?definitionId=6'>awesomebytes</a>")
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-01-10 10:53 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-01-10 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 213dd7e3231033ad02a7c831df210acec32cf282
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 10:52:46 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 10:53:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=213dd7e3
scripts/auto-bootstraps/analyse_result: add links for stage2/3 fails
much like emerge -e system, stage 2 and 3 use portage, thus individual
buildlogs exist, which are much less in size than the entire stagelogs.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 880fd64343..459341c8c7 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -67,15 +67,27 @@ def get_err_reason(arch, dte, err):
with open(stagelog, 'rb') as f:
errexp = re.compile(r'^( \* (ERROR:|Fetch failed for)|emerge: there are no) ')
for line in f:
- res = errexp.match(line.decode('utf-8', 'ignore'))
+ line = line.decode('utf-8', 'ignore')
+ res = errexp.match(line)
if res:
break
if not line:
return '<a href="%s/stage%d.log">stage %d</a> failed' % \
(os.path.join(arch, '%d' % dte), err, err)
- return '<a href="%s/stage%d.log">stage %d</a> failed<br />%s' % \
- (os.path.join(arch, '%d' % dte), err, err, \
- html.escape(line.decode('utf-8', 'ignore')))
+ m = re.fullmatch(
+ r'(\* ERROR: )([a-z-]+/[a-zA-Z0-9._-]+)(::gentoo.* failed.*)',
+ line.strip())
+ if m:
+ return '<a href="%s/stage%d.log">stage %d</a> failed<br />' % \
+ (os.path.join(arch, '%d' % dte), err, err) + \
+ '%s<a href="%s/temp/build.log">%s</a>%s' % \
+ (html.escape(m.group(1)), \
+ os.path.join(arch, '%d' % dte, "portage", m.group(2)), \
+ html.escape(m.group(2)), html.escape(m.group(3)))
+ else:
+ return '<a href="%s/stage%d.log">stage %d</a> failed<br />%s' % \
+ (os.path.join(arch, '%d' % dte), err, err, \
+ html.escape(line))
else:
return 'stage %d did not start' % err
if err == 4:
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-01-05 19:09 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-01-05 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 72cd80722aaf396ba27317b91cacba3c780eaec4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 19:09:25 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 19:09:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=72cd8072
scripts/auto-bootstraps/dobootstrap: pass USE_CPU_CORES on
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 9ef644be2c..50b550f0ba 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -124,6 +124,7 @@ do_prepare() {
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
+ ${USE_CPU_CORES+USE_CPU_CORES=}${USE_CPU_CORES} \
${DARWIN_USE_GCC+DARWIN_USE_GCC=}${DARWIN_USE_GCC} \
${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP=}${PREFIX_DISABLE_RAP} \
${keepalive} ${BASH} ${bootstrapscript} bootstrap
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2021-01-05 19:09 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2021-01-05 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 962f937e460a3204d43b6772665494e1d9250d6a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 19:08:05 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 19:09:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=962f937e
scripts/auto-bootstraps/analyse_result: sort triplets more complicatedly
- sort by os, vendor, cpu
- sort os by name, and its version
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 32 ++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index b2cc9bfec8..880fd64343 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -5,6 +5,7 @@ import glob
import re
import time
import html
+from functools import cmp_to_key
resultsdir='./results'
@@ -171,7 +172,36 @@ with os.scandir(resultsdir) as it:
endc = '\033[0m'
print("%s%30s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc))
-sarchs = sorted(archs, key=lambda a: '-'.join(a.split('-')[::-1]))
+def archSort(l, r):
+ """
+ Sort by os, vendor, cpu
+ """
+ lcpu, lvendor, los = l.split('-', 2)
+ losname = re.split('\d', los, 1)[0]
+ losver = los.split(losname, 1)[1]
+ rcpu, rvendor, ros = r.split('-', 2)
+ rosname = re.split('\d', ros, 1)[0]
+ rosver = ros.split(rosname, 1)[1]
+
+ if losname > rosname:
+ return 1
+ if losname < rosname:
+ return -1
+ if float(losver) > float(rosver):
+ return 1
+ if float(losver) < float(rosver):
+ return -1
+ if lvendor > rvendor:
+ return 1
+ if lvendor < rvendor:
+ return -1
+ if lcpu > rcpu:
+ return 1
+ if lcpu < rcpu:
+ return -1
+ return 0
+
+sarchs = sorted(archs, key=cmp_to_key(archSort))
def gentags(infos):
tags = ''
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-12-09 12:20 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-12-09 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 6e27fbc59879b82017e9614004bf5db8945ec11c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 12:19:04 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 12:19:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6e27fbc5
scripts/auto-bootstraps/dobootstrap: facilitate non-RAP bootstrap
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index e8e47f3ef7..5970ecb540 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -125,6 +125,7 @@ do_prepare() {
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
${DARWIN_USE_GCC+DARWIN_USE_GCC=}${DARWIN_USE_GCC} \
+ ${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP=}${PREFIX_DISABLE_RAP} \
${keepalive} ${BASH} ${bootstrapscript} bootstrap
endtime=${SECONDS}
@@ -194,9 +195,10 @@ case $1 in
fi
for arg in "${@:1}" ; do
case "${arg}" in
- libressl) export DOLIBRESSL=1 ;;
- latesttree) export LATEST_TREE_YES=1 ;;
- 32|64) bitw=${arg} ;;
+ libressl) export DOLIBRESSL=1 ;;
+ latesttree) export LATEST_TREE_YES=1 ;;
+ norap|no-rap) export PREFIX_DISABLE_RAP=yes ;;
+ 32|64) bitw=${arg} ;;
esac
done
do_prepare ${bitw}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-12-08 7:26 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-12-08 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 54b2c23688965c5ddf48c1f6a9bae45ef092e2c8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 7 18:41:54 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 07:26:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=54b2c236
scripts/auto-bootstraps/analyse_result: fix SyntaxWarning
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 4420c3ff7c..b2cc9bfec8 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -127,7 +127,7 @@ with os.scandir(resultsdir) as it:
if os.path.exists(elapsedf):
with open(elapsedf, 'rb') as f:
l = f.readline()
- if l is not '':
+ if l != '':
elapsedtime = int(l)
mconf = os.path.join(resultsdir, arch, "%s" % d, "make.conf")
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-11-28 10:03 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-11-28 10:03 UTC (permalink / raw
To: gentoo-commits
commit: 161e039974fc1de7a1d097983837b62974c9d1f8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 10:03:33 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 10:03:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=161e0399
scripts/auto-bootstraps/analyse_result: report features before snapshot
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 53dd2a677b..4420c3ff7c 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -179,6 +179,11 @@ def gentags(infos):
tags = tags + '''
<span style="border-radius: 5px; background-color: purple; color: white;
display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">libressl</span>
+'''
+
+ if infos.get('darwingcc', False):
+ tags = tags + '''
+<span style="border-radius: 5px; background-color: darkgreen; color: white; display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">GCC</span>
'''
snap = infos.get('snapshot', None)
@@ -186,11 +191,6 @@ display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: upp
tags = tags + '''
<span style="border-radius: 5px; background-color: darkblue; color: white;
display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">''' + snap + '''</span>
-'''
-
- if infos.get('darwingcc', False):
- tags = tags + '''
-<span style="border-radius: 5px; background-color: darkgreen; color: white; display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">GCC</span>
'''
return tags
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-11-28 10:02 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-11-28 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 9e4d616274d106532fa3838aaaf202f3b1c1e944
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 10:01:50 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 10:01:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9e4d6162
scripts/auto-bootstraps/analyse_result: fix green background colour
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index e7486e3226..53dd2a677b 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -190,7 +190,7 @@ display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: upp
if infos.get('darwingcc', False):
tags = tags + '''
-<span style="border-radius: 5px; background-color: dark-green; color: white; display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">GCC</span>
+<span style="border-radius: 5px; background-color: darkgreen; color: white; display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">GCC</span>
'''
return tags
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-11-27 10:58 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-11-27 10:58 UTC (permalink / raw
To: gentoo-commits
commit: d3c736c968d330bbd886e9a7b6134e7db6ae2f06
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 10:58:38 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 10:58:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d3c736c9
scripts/auto-bootstraps/dobootstrap: allow EPREFIX override with resume
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 1273f9a2da..e8e47f3ef7 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -28,7 +28,7 @@ do_prepare() {
local bootstrap
if [[ -n ${RESUME} && -n ${bitw} && -n ${dte} ]] ; then
- bootstrap=bootstrap${bitw}-${dte}/bootstrap-prefix.sh
+ bootstrap=${OVERRIDE_EPREFIX:-bootstrap${bitw}-${dte}}/bootstrap-prefix.sh
elif [[ -n ${DOLOCAL} ]] ; then
bootstrap=${BOOTSTRAP}
else
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-11-27 10:58 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-11-27 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 120396407992ebdf3365e8e792d15a34d283a805
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 10:58:05 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 10:58:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=12039640
scripts/auto-bootstraps/analyse_result: add GCC tag for macOS
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 871692d2e3..e7486e3226 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -121,6 +121,7 @@ with os.scandir(resultsdir) as it:
elapsedtime = None
haslssl = False
snapshot = None
+ darwingcc = False
elapsedf = os.path.join(resultsdir, arch, "%s" % d, "elapsedtime")
if os.path.exists(elapsedf):
@@ -150,11 +151,14 @@ with os.scandir(resultsdir) as it:
snapshot = re.split('[-.]', x)[2]
elif 'total size is' in x:
snapshot = 'rsync'
+ elif 'Darwin with GCC toolchain' in x:
+ darwingcc = True
infos[d] = {
'elapsedtime': elapsedtime,
'libressl': haslssl,
- 'snapshot': snapshot
+ 'snapshot': snapshot,
+ 'darwingcc': darwingcc
}
archs[arch] = (fail, state, suc, infos)
@@ -182,6 +186,11 @@ display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: upp
tags = tags + '''
<span style="border-radius: 5px; background-color: darkblue; color: white;
display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">''' + snap + '''</span>
+'''
+
+ if infos.get('darwingcc', False):
+ tags = tags + '''
+<span style="border-radius: 5px; background-color: dark-green; color: white; display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">GCC</span>
'''
return tags
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-11-24 9:27 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-11-24 9:27 UTC (permalink / raw
To: gentoo-commits
commit: a3e46532298f425d4e879d70be3e48de72461bb0
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 09:27:13 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 09:27:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a3e46532
scripts/auto-bootstraps/dobootstrap: pass through DARWIN_USE_GCC
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 4cd5f94c71..1273f9a2da 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -124,6 +124,7 @@ do_prepare() {
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
+ ${DARWIN_USE_GCC+DARWIN_USE_GCC=}${DARWIN_USE_GCC} \
${keepalive} ${BASH} ${bootstrapscript} bootstrap
endtime=${SECONDS}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-06-07 12:12 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-06-07 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 82e52682d476d50f7c1ea225301665f974e2ad9f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 12:12:03 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 12:12:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=82e52682
scripts/auto-bootstraps/dobootstrap: drop distfiles.g.o from mirrors
Since the bootstrap script falls back to distfiles.g.o now, it has no
use to try it twice.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index d4207a1a8b..4cd5f94c71 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -189,7 +189,7 @@ case $1 in
echo "internal host, activating local and DOPUBLISH"
export DOLOCAL=1
export DOPUBLISH=1
- export GENTOO_MIRRORS="http://distfileslocal http://distfiles.gentoo.org"
+ export GENTOO_MIRRORS="http://distfileslocal"
fi
for arg in "${@:1}" ; do
case "${arg}" in
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-06-01 8:56 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-06-01 8:56 UTC (permalink / raw
To: gentoo-commits
commit: b9098b502f300e410799bd26606564e9546cb96b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 1 08:55:35 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 1 08:55:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b9098b50
scripts/auto-bootstraps/update_distfiles: allow multiple iterations
allow multiple dirs to be processed in a single call
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/update_distfiles.py | 58 +++++++++++++++--------------
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/scripts/auto-bootstraps/update_distfiles.py b/scripts/auto-bootstraps/update_distfiles.py
index 9287afa83e..76d3da64df 100755
--- a/scripts/auto-bootstraps/update_distfiles.py
+++ b/scripts/auto-bootstraps/update_distfiles.py
@@ -12,32 +12,34 @@ def hash_file(f):
hsh.update(fle.read())
return hsh.hexdigest()
-with os.scandir(path=sys.argv[1]) as it:
- for f in it:
- if not f.is_file() or f.name.startswith('.'):
- continue
- srcfile = os.path.join(sys.argv[1], f.name)
- h = hash_file(srcfile)
- distname = os.path.join(distfilessrc,
- f.name + "@" + h).lower()
- isnew = False
- if os.path.exists(distname):
- print("DUP %s" % distname.split('/')[-1])
- os.remove(srcfile)
- os.link(distname, srcfile, follow_symlinks=False)
- else:
- print("NEW %s" % distname.split('/')[-1])
- os.link(srcfile, distname)
- isnew = True
+for path in sys.argv[1:]:
+ print("processing %s" % path)
+ with os.scandir(path=path) as it:
+ for f in it:
+ if not f.is_file() or f.name.startswith('.'):
+ continue
+ srcfile = os.path.join(path, f.name)
+ h = hash_file(srcfile)
+ distname = os.path.join(distfilessrc,
+ f.name + "@" + h).lower()
+ isnew = False
+ if os.path.exists(distname):
+ print("DUP %s" % distname.split('/')[-1])
+ os.remove(srcfile)
+ os.link(distname, srcfile, follow_symlinks=False)
+ else:
+ print("NEW %s" % distname.split('/')[-1])
+ os.link(srcfile, distname)
+ isnew = True
- # generate a name match for distfiles serving along the
- # specification from gentoo-dev ML 18 Oct 2019 15:41:32 +0200
- # 4c7465824f1fb69924c826f6bbe3ee73afa08ec8.camel@gentoo.org
- blh = hashlib.blake2b(bytes(f.name.encode('us-ascii'))).hexdigest()
- trgpth = os.path.join(distfilessrc, 'public', blh[:2], f.name);
- if isnew or !os.path.exists(trgpth):
- if os.path.exists(trgpth):
- os.remove(trgpth)
- os.makedirs(os.path.join(distfilessrc, 'public', blh[:2]),
- exist_ok=True)
- os.link(distname, trgpth);
+ # generate a name match for distfiles serving along the
+ # specification from gentoo-dev ML 18 Oct 2019 15:41:32 +0200
+ # 4c7465824f1fb69924c826f6bbe3ee73afa08ec8.camel@gentoo.org
+ blh = hashlib.blake2b(bytes(f.name.encode('us-ascii'))).hexdigest()
+ trgpth = os.path.join(distfilessrc, 'public', blh[:2], f.name);
+ if isnew or not os.path.exists(trgpth):
+ if os.path.exists(trgpth):
+ os.remove(trgpth)
+ os.makedirs(os.path.join(distfilessrc, 'public', blh[:2]),
+ exist_ok=True)
+ os.link(distname, trgpth);
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-06-01 8:37 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-06-01 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 35f3015c8331414d5e298c9031b9fbdd2320aad7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 1 08:37:37 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 1 08:37:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=35f3015c
scripts/auto-bootstraps/update_distfiles: try to populate mirror structure
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/update_distfiles.py | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/update_distfiles.py b/scripts/auto-bootstraps/update_distfiles.py
index c8c54b7aa7..9287afa83e 100755
--- a/scripts/auto-bootstraps/update_distfiles.py
+++ b/scripts/auto-bootstraps/update_distfiles.py
@@ -7,7 +7,7 @@ import sys
distfilessrc='./distfiles'
def hash_file(f):
- hsh = hashlib.new('sha1')
+ hsh = hashlib.sha1()
with open(f, 'rb') as fle:
hsh.update(fle.read())
return hsh.hexdigest()
@@ -20,6 +20,7 @@ with os.scandir(path=sys.argv[1]) as it:
h = hash_file(srcfile)
distname = os.path.join(distfilessrc,
f.name + "@" + h).lower()
+ isnew = False
if os.path.exists(distname):
print("DUP %s" % distname.split('/')[-1])
os.remove(srcfile)
@@ -27,3 +28,16 @@ with os.scandir(path=sys.argv[1]) as it:
else:
print("NEW %s" % distname.split('/')[-1])
os.link(srcfile, distname)
+ isnew = True
+
+ # generate a name match for distfiles serving along the
+ # specification from gentoo-dev ML 18 Oct 2019 15:41:32 +0200
+ # 4c7465824f1fb69924c826f6bbe3ee73afa08ec8.camel@gentoo.org
+ blh = hashlib.blake2b(bytes(f.name.encode('us-ascii'))).hexdigest()
+ trgpth = os.path.join(distfilessrc, 'public', blh[:2], f.name);
+ if isnew or !os.path.exists(trgpth):
+ if os.path.exists(trgpth):
+ os.remove(trgpth)
+ os.makedirs(os.path.join(distfilessrc, 'public', blh[:2]),
+ exist_ok=True)
+ os.link(distname, trgpth);
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2020-06-01 7:47 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2020-06-01 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 3bea9744c2069f6222d587107e822c7b3a88ed0a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 1 07:46:41 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 1 07:46:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3bea9744
scripts/auto-bootstraps/update_distfiles: switch to generic py3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/update_distfiles.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/update_distfiles.py b/scripts/auto-bootstraps/update_distfiles.py
index 8f44f7fa20..c8c54b7aa7 100755
--- a/scripts/auto-bootstraps/update_distfiles.py
+++ b/scripts/auto-bootstraps/update_distfiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
import hashlib
import os
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-07-14 9:07 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-07-14 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 6ae39ca3ee36e9794788c1bc73edf4e35d3d0461
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:04:42 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 09:06:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6ae39ca3
scripts/auto-bootstraps/dobootstrap: parse default args in any order
allow using default bitwidth combined with things like libressl
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 047846e5be..d4207a1a8b 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -184,19 +184,21 @@ case $1 in
do_prepare "$2" ${3:-${BOOTSTRAP_DATE}}
;;
*)
+ bitw=
if [[ ${0} == /net/* ]] ; then
echo "internal host, activating local and DOPUBLISH"
export DOLOCAL=1
export DOPUBLISH=1
export GENTOO_MIRRORS="http://distfileslocal http://distfiles.gentoo.org"
fi
- for arg in "${@:2}" ; do
+ for arg in "${@:1}" ; do
case "${arg}" in
libressl) export DOLIBRESSL=1 ;;
latesttree) export LATEST_TREE_YES=1 ;;
+ 32|64) bitw=${arg} ;;
esac
done
- do_prepare $1
+ do_prepare ${bitw}
;;
esac
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-07-02 9:37 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-07-02 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 2e2c0fe2d1221ae2a0ff38de7653bb5c238aab0d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 09:36:44 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 09:36:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2e2c0fe2
scripts/auto-bootstraps/analyse_result: bring back elapsedtime
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 2b0e04a101..871692d2e3 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -152,7 +152,7 @@ with os.scandir(resultsdir) as it:
snapshot = 'rsync'
infos[d] = {
- 'etime': elapsedtime,
+ 'elapsedtime': elapsedtime,
'libressl': haslssl,
'snapshot': snapshot
}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-07-02 9:37 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-07-02 9:37 UTC (permalink / raw
To: gentoo-commits
commit: ad69711ccdffa7081597a063b1709c7abfcb9929
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 09:35:10 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 09:35:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ad69711c
scripts/auto-bootstraps/analyse_result: split out properties per run
success and failed runs aren't the same thing, so split out the tags for
them (libressl and bootstrap snapshot)
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 98 ++++++++++++++++++-------------
1 file changed, 57 insertions(+), 41 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index b67e494bd7..2b0e04a101 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -116,40 +116,48 @@ with os.scandir(resultsdir) as it:
arch = f.name
fail, state, suc = analyse_arch(os.path.join(resultsdir, arch))
- elapsedtime = None
- haslssl = False
- snapshot = None
- if suc:
- elapsedf = os.path.join(resultsdir, arch, "%s" % suc, "elapsedtime")
+ infos = {}
+ for d in [ fail, suc ]:
+ elapsedtime = None
+ haslssl = False
+ snapshot = None
+
+ elapsedf = os.path.join(resultsdir, arch, "%s" % d, "elapsedtime")
if os.path.exists(elapsedf):
with open(elapsedf, 'rb') as f:
l = f.readline()
if l is not '':
elapsedtime = int(l)
- mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf")
- if os.path.exists(mconf):
- with open(mconf, 'rb') as f:
- l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
- l = list(filter(lambda x: 'USE=' in x, l))
- for x in l:
- if 'libressl' in x:
- haslssl = True
-
- mconf = os.path.join(resultsdir, arch, "%s" % suc, "stage1.log")
- if os.path.exists(mconf):
- with open(mconf, 'rb') as f:
- l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
- for x in l:
- if 'Fetching ' in x:
- if 'portage-latest.tar.bz2' in x:
- snapshot = 'latest'
- elif 'prefix-overlay-' in x:
- snapshot = re.split('[-.]', x)[2]
- elif 'total size is' in x:
- snapshot = 'rsync'
-
- archs[arch] = (fail, state, suc, elapsedtime, haslssl, snapshot)
+ mconf = os.path.join(resultsdir, arch, "%s" % d, "make.conf")
+ if os.path.exists(mconf):
+ with open(mconf, 'rb') as f:
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
+ l = list(filter(lambda x: 'USE=' in x, l))
+ for x in l:
+ if 'libressl' in x:
+ haslssl = True
+
+ mconf = os.path.join(resultsdir, arch, "%s" % d, "stage1.log")
+ if os.path.exists(mconf):
+ with open(mconf, 'rb') as f:
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
+ for x in l:
+ if 'Fetching ' in x:
+ if 'portage-latest.tar.bz2' in x:
+ snapshot = 'latest'
+ elif 'prefix-overlay-' in x:
+ snapshot = re.split('[-.]', x)[2]
+ elif 'total size is' in x:
+ snapshot = 'rsync'
+
+ infos[d] = {
+ 'etime': elapsedtime,
+ 'libressl': haslssl,
+ 'snapshot': snapshot
+ }
+
+ archs[arch] = (fail, state, suc, infos)
if not suc:
color = '\033[1;31m' # red
elif fail and suc < fail:
@@ -161,6 +169,23 @@ with os.scandir(resultsdir) as it:
sarchs = sorted(archs, key=lambda a: '-'.join(a.split('-')[::-1]))
+def gentags(infos):
+ tags = ''
+ if infos.get('libressl', None):
+ tags = tags + '''
+<span style="border-radius: 5px; background-color: purple; color: white;
+display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">libressl</span>
+'''
+
+ snap = infos.get('snapshot', None)
+ if snap:
+ tags = tags + '''
+<span style="border-radius: 5px; background-color: darkblue; color: white;
+display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">''' + snap + '''</span>
+'''
+
+ return tags
+
# generate html edition
with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<html>")
@@ -172,7 +197,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<th>last successful run</th><th>last failed run</th>")
h.write("<th>failure</th>")
for arch in sarchs:
- fail, errcode, suc, et, lssl, snap = archs[arch]
+ fail, errcode, suc, infos = archs[arch]
if not suc:
state = 'red'
elif fail and suc < fail:
@@ -180,18 +205,6 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
else:
state = 'limegreen'
- tags = ''
- if lssl:
- tags = tags + '''
-<span style="border-radius: 5px; background-color: purple; color: white;
-display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">libressl</span>
-'''
- if snap:
- tags = tags + '''
-<span style="border-radius: 5px; background-color: darkblue; color: white;
-display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">''' + snap + '''</span>
-'''
-
h.write('<tr>')
h.write('<td bgcolor="%s" nowrap="nowrap">' % state)
@@ -200,7 +213,9 @@ display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: upp
h.write("<td>")
if suc:
+ tags = gentags(infos[suc])
etxt = ''
+ et = infos[suc].get('elapsedtime', None)
if et:
if et > 86400:
etxt = ' (%.1f days)' % (et / 86400)
@@ -215,6 +230,7 @@ display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: upp
h.write("<td>")
if fail:
+ tags = gentags(infos[fail])
h.write('<a href="%s/%s">%s</a>%s' % (arch, fail, fail, tags))
else:
h.write('<i>never</i>')
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-07-02 9:04 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-07-02 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 4b38da959964050bb8a9160123b6ebe563a845fa
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 09:04:07 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 09:04:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4b38da95
scripts/auto-bootstraps/analyse_result: print snapshot tree in use
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 42 +++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 11 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index dbe0d4c729..b67e494bd7 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -118,6 +118,7 @@ with os.scandir(resultsdir) as it:
elapsedtime = None
haslssl = False
+ snapshot = None
if suc:
elapsedf = os.path.join(resultsdir, arch, "%s" % suc, "elapsedtime")
if os.path.exists(elapsedf):
@@ -125,16 +126,30 @@ with os.scandir(resultsdir) as it:
l = f.readline()
if l is not '':
elapsedtime = int(l)
- mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf")
- if os.path.exists(mconf):
- with open(mconf, 'rb') as f:
- l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
- l = list(filter(lambda x: 'USE=' in x, l))
- for x in l:
- if 'libressl' in x:
- haslssl = True
-
- archs[arch] = (fail, state, suc, elapsedtime, haslssl)
+
+ mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf")
+ if os.path.exists(mconf):
+ with open(mconf, 'rb') as f:
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
+ l = list(filter(lambda x: 'USE=' in x, l))
+ for x in l:
+ if 'libressl' in x:
+ haslssl = True
+
+ mconf = os.path.join(resultsdir, arch, "%s" % suc, "stage1.log")
+ if os.path.exists(mconf):
+ with open(mconf, 'rb') as f:
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
+ for x in l:
+ if 'Fetching ' in x:
+ if 'portage-latest.tar.bz2' in x:
+ snapshot = 'latest'
+ elif 'prefix-overlay-' in x:
+ snapshot = re.split('[-.]', x)[2]
+ elif 'total size is' in x:
+ snapshot = 'rsync'
+
+ archs[arch] = (fail, state, suc, elapsedtime, haslssl, snapshot)
if not suc:
color = '\033[1;31m' # red
elif fail and suc < fail:
@@ -157,7 +172,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<th>last successful run</th><th>last failed run</th>")
h.write("<th>failure</th>")
for arch in sarchs:
- fail, errcode, suc, et, lssl = archs[arch]
+ fail, errcode, suc, et, lssl, snap = archs[arch]
if not suc:
state = 'red'
elif fail and suc < fail:
@@ -170,6 +185,11 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
tags = tags + '''
<span style="border-radius: 5px; background-color: purple; color: white;
display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">libressl</span>
+'''
+ if snap:
+ tags = tags + '''
+<span style="border-radius: 5px; background-color: darkblue; color: white;
+display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">''' + snap + '''</span>
'''
h.write('<tr>')
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-21 19:01 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-21 19:01 UTC (permalink / raw
To: gentoo-commits
commit: fc4d9347493a79add06058c70f506769bbedd4b9
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 19:01:12 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 19:01:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc4d9347
scripts/auto-bootstraps/analyse_result: flag libressl builds
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 90312300db..dbe0d4c729 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -117,6 +117,7 @@ with os.scandir(resultsdir) as it:
fail, state, suc = analyse_arch(os.path.join(resultsdir, arch))
elapsedtime = None
+ haslssl = False
if suc:
elapsedf = os.path.join(resultsdir, arch, "%s" % suc, "elapsedtime")
if os.path.exists(elapsedf):
@@ -124,8 +125,16 @@ with os.scandir(resultsdir) as it:
l = f.readline()
if l is not '':
elapsedtime = int(l)
-
- archs[arch] = (fail, state, suc, elapsedtime)
+ mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf")
+ if os.path.exists(mconf):
+ with open(mconf, 'rb') as f:
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()]
+ l = list(filter(lambda x: 'USE=' in x, l))
+ for x in l:
+ if 'libressl' in x:
+ haslssl = True
+
+ archs[arch] = (fail, state, suc, elapsedtime, haslssl)
if not suc:
color = '\033[1;31m' # red
elif fail and suc < fail:
@@ -133,7 +142,7 @@ with os.scandir(resultsdir) as it:
else:
color = '\033[1;32m' # green
endc = '\033[0m'
- print("%s%24s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc))
+ print("%s%30s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc))
sarchs = sorted(archs, key=lambda a: '-'.join(a.split('-')[::-1]))
@@ -148,7 +157,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<th>last successful run</th><th>last failed run</th>")
h.write("<th>failure</th>")
for arch in sarchs:
- fail, errcode, suc, et = archs[arch]
+ fail, errcode, suc, et, lssl = archs[arch]
if not suc:
state = 'red'
elif fail and suc < fail:
@@ -156,6 +165,13 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
else:
state = 'limegreen'
+ tags = ''
+ if lssl:
+ tags = tags + '''
+<span style="border-radius: 5px; background-color: purple; color: white;
+display: inline-block; font-size: x-small; padding: 3px 4px; text-transform: uppercase !important;">libressl</span>
+'''
+
h.write('<tr>')
h.write('<td bgcolor="%s" nowrap="nowrap">' % state)
@@ -172,14 +188,14 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
etxt = ' (%.1f hours)' % (et / 3600)
else:
etxt = ' (%d minutes)' % (et / 60)
- h.write('<a href="%s/%s">%s</a>%s' % (arch, suc, suc, etxt))
+ h.write('<a href="%s/%s">%s</a>%s%s' % (arch, suc, suc, etxt, tags))
else:
h.write('<i>never</i>')
h.write("</td>")
h.write("<td>")
if fail:
- h.write('<a href="%s/%s">%s</a>' % (arch, fail, fail))
+ h.write('<a href="%s/%s">%s</a>%s' % (arch, fail, fail, tags))
else:
h.write('<i>never</i>')
h.write("</td>")
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-18 10:42 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-18 10:42 UTC (permalink / raw
To: gentoo-commits
commit: b95ceb616795c9ff7906c05dd640c1f335d3f1f2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 10:42:38 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 10:42:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b95ceb61
scripts/auto-bootstraps/analyse_result: use standard date format
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index ca6621554f..90312300db 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -191,7 +191,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("</tr>")
h.write("</table>")
- now = time.strftime('%Y-%m-%d %H:%M', time.gmtime())
+ now = time.strftime('%Y-%m-%dT%H:%MZ', time.gmtime())
h.write("<p><i>generated: %s</i></p>" % now)
h.write("<p>See also <a href='https://dev.azure.com/12719821/12719821/_build?definitionId=6'>awesomebytes</a>")
h.write(" and <a href='https://dev.azure.com/gentoo-prefix/ci-builds/_build/'>Azure Gentoo Prefix CI pipelines</a></p>")
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-16 18:44 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-16 18:44 UTC (permalink / raw
To: gentoo-commits
commit: e7bde60bec0494077dcee3f72c523d407b02aad1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 14:58:32 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 14:58:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e7bde60b
scripts/auto-bootstraps/dobootstrap: sync is-rap logic for failed builds
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 1ec3c3f220..047846e5be 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -139,7 +139,8 @@ do_prepare() {
local dist=$(lsb_release -si)
local rel=$(lsb_release -sr)
local platform=pc
- [[ -e usr/lib/libc.so ]] && platform=rap
+ # this is the logic used in bootstrap-prefix.sh
+ [[ ${PREFIX_DISABLE_RAP} != "yes" ]] && platform=rap
chost=${chost%%-*}-${platform}-linux-${dist,,}${rel}
fi
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-14 9:30 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-14 9:30 UTC (permalink / raw
To: gentoo-commits
commit: ccd4ddb0de56e451f4a84c35675b71aefce9cc9e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 09:29:57 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 09:29:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ccd4ddb0
scripts/auto-bootstraps/dobootstrap: flag RAP in CHOST (platform)
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 048ea397c1..1ec3c3f220 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -138,7 +138,9 @@ do_prepare() {
# UNIX vendors
local dist=$(lsb_release -si)
local rel=$(lsb_release -sr)
- chost=${chost%%-*}-pc-linux-${dist,,}${rel}
+ local platform=pc
+ [[ -e usr/lib/libc.so ]] && platform=rap
+ chost=${chost%%-*}-${platform}-linux-${dist,,}${rel}
fi
${keepalive} rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-14 7:50 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-14 7:50 UTC (permalink / raw
To: gentoo-commits
commit: a7378b0bf765954f24e84ef9d3ab679c05bd332d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 07:50:18 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 07:50:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a7378b0b
scripts/auto-bootstraps/dobootstrap: fix distdir path
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 5306491bc8..048ea397c1 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -153,7 +153,7 @@ do_prepare() {
bootstrap-prefix.sh \
startprefix \
elapsedtime \
- usr/portage/distfiles \
+ var/cache/distfiles \
var/tmp/portage \
var/log/emerge.log \
etc/portage/make.conf \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-13 19:21 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-13 19:21 UTC (permalink / raw
To: gentoo-commits
commit: 3dc783ba8ca5e07d25647bfaa2f12a49283873e1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 19:21:43 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 19:21:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3dc783ba
scripts/auto-bootstraps/dobootstrap: try to distinguish linux hosts
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index c7f471315d..5306491bc8 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -129,6 +129,18 @@ do_prepare() {
if [[ -n ${DOPUBLISH} ]] ; then
echo $((endtime - starttime)) > elapsedtime
+
+ # massage CHOST on Linux systems
+ if [[ ${chost} == *-linux-gnu* ]] ; then
+ # two choices here: x86_64_ubuntu16-linux-gnu
+ # x86_64-pc-linux-ubuntu16
+ # I choose the latter because it is compatible with most
+ # UNIX vendors
+ local dist=$(lsb_release -si)
+ local rel=$(lsb_release -sr)
+ chost=${chost%%-*}-pc-linux-${dist,,}${rel}
+ fi
+
${keepalive} rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
${keepalive} rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
${keepalive} rsync -rltv \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-06-06 18:56 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-06-06 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 5013468354bf6d22bb1478a24656a37e5e36bb18
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 08:14:56 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 08:14:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=50134683
scripts/auto-bootstraps/dobootstrap: set libressl flags for CURL_SSL
portage-utils wants openssl/libressl and gpgme, which needs curl
curl apparently has a different way of selecting ssl implementation, so
set the flags for those USE_EXPAND to unbreak the dependency tree
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 5a37b5391d..c7f471315d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -109,6 +109,7 @@ do_prepare() {
keepalive=$(type -P caffeinate)
[[ -x ${keepalive} ]] && keepalive+=" -i -m -s" || keepalive=
+ local libressluse="libressl -curl_ssl_openssl curl_ssl_libressl"
starttime=${SECONDS}
env -i \
HOME=${EPREFIX} \
@@ -119,7 +120,7 @@ do_prepare() {
EPREFIX=${EPREFIX} \
${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
- ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \
+ ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE="${libressluse}"} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-05-22 20:12 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-05-22 20:12 UTC (permalink / raw
To: gentoo-commits
commit: d3b07d3e00912f859b692d196c5e579d018a051a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 20:11:40 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 22 20:11:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d3b07d3e
scripts/auto-bootstraps/dobootstrap: apply more caffeine
ensure we don't fall asleep while rsyncing the build results back to the
server.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index de986e0169..5a37b5391d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -128,9 +128,9 @@ do_prepare() {
if [[ -n ${DOPUBLISH} ]] ; then
echo $((endtime - starttime)) > elapsedtime
- rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
- rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
- rsync -rltv \
+ ${keepalive} rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
+ ${keepalive} rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
+ ${keepalive} rsync -rltv \
--exclude=work/ \
--exclude=homedir/ \
--exclude=files \
@@ -145,7 +145,8 @@ do_prepare() {
var/log/emerge.log \
etc/portage/make.conf \
${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/
- rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/push-complete/
+ ${keepalive} rsync -q /dev/null \
+ ${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/push-complete/
fi
}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-05-22 17:33 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-05-22 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 2f1b427e47422df8c7e6d1504d89988fa48fe004
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 17:28:11 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 22 17:28:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f1b427e
scripts/auto-bootstraps/dobootstrap: refine shell usage
- reuse bash shell the script was invoked with to launch
bootstrap-prefix.sh
- set SHELL=/bin/sh for maximum compatability
- avoid env exec error when GENTOO_MIRRORS is empty
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index e27bb0eeee..de986e0169 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -112,18 +112,18 @@ do_prepare() {
starttime=${SECONDS}
env -i \
HOME=${EPREFIX} \
- SHELL=/bin/bash \
+ SHELL=/bin/sh \
TERM=${TERM} \
USER=${USER} \
CHOST=${chost} \
EPREFIX=${EPREFIX} \
- ${GENTOO_MIRRORS+GENTOO_MIRRORS=}${GENTOO_MIRRORS} \
+ ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
- ${keepalive} /bin/bash -l -c "${BASH} ${bootstrapscript} bootstrap"
+ ${keepalive} ${BASH} ${bootstrapscript} bootstrap
endtime=${SECONDS}
if [[ -n ${DOPUBLISH} ]] ; then
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-22 14:13 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-22 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 0eb8f3e8a6e9f4e233d4232739355184f728fa9a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 14:13:09 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 14:13:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0eb8f3e8
scripts/auto-bootstraps/dobootstrap: use multiple mirrors now we support that
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 12b25b4caa..e27bb0eeee 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -171,7 +171,7 @@ case $1 in
echo "internal host, activating local and DOPUBLISH"
export DOLOCAL=1
export DOPUBLISH=1
- export GENTOO_MIRRORS="http://distfileslocal/"
+ export GENTOO_MIRRORS="http://distfileslocal http://distfiles.gentoo.org"
fi
for arg in "${@:2}" ; do
case "${arg}" in
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-14 8:15 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-14 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 66e407b906b0e1fc97b1c174da13ce2c618f393e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 08:15:10 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 08:15:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=66e407b9
scripts/auto-bootstraps: add link to Haubi's CIs
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 487b8c77c7..ca6621554f 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -193,6 +193,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("</table>")
now = time.strftime('%Y-%m-%d %H:%M', time.gmtime())
h.write("<p><i>generated: %s</i></p>" % now)
- h.write("<p>See also <a href='https://dev.azure.com/12719821/12719821/_build?definitionId=6'>awesomebytes</a></p>")
+ h.write("<p>See also <a href='https://dev.azure.com/12719821/12719821/_build?definitionId=6'>awesomebytes</a>")
+ h.write(" and <a href='https://dev.azure.com/gentoo-prefix/ci-builds/_build/'>Azure Gentoo Prefix CI pipelines</a></p>")
h.write("</body>")
h.write("</html>")
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-06 11:24 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-06 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 0b5c7cac9be2e6cca05d00a35f81e717bbed38b7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 11:24:03 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 11:24:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0b5c7cac
auto-bootstraps: copy etc/portage/make.conf as build result
make.conf might show some build configuration
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 1 +
scripts/auto-bootstraps/process_uploads.sh | 2 ++
2 files changed, 3 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 1d2cfa6296..12b25b4caa 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -143,6 +143,7 @@ do_prepare() {
usr/portage/distfiles \
var/tmp/portage \
var/log/emerge.log \
+ etc/portage/make.conf \
${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/push-complete/
fi
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
index 402f9e4ae6..ca39789510 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -36,6 +36,7 @@ for d in ${UPLOADDIR}/* ; do
emerge.log \
startprefix \
elapsedtime \
+ make.conf \
distfiles ;
do
[[ -e "${d}/${dir}/${f}" ]] && \
@@ -43,6 +44,7 @@ for d in ${UPLOADDIR}/* ; do
done
if [[ -e "${d}/${dir}/portage" ]] ; then
for pkg in "${d}/${dir}/portage"/*/* ; do
+ [[ -e ${pkg} ]] || continue
w=${pkg#${d}/}
mkdir -p "${RESULTSDIR}/${w}"
[[ -e "${pkg}"/build-info ]] && \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-06 11:18 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-06 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 6e6d35586263206be18bd1a511d4067017f6299e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 11:12:18 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 11:18:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6e6d3558
dobootstrap: set GENTOO_MIRRORS only when actually requested
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 35b693ddd4..1d2cfa6296 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -116,8 +116,8 @@ do_prepare() {
TERM=${TERM} \
USER=${USER} \
CHOST=${chost} \
- GENTOO_MIRRORS="http://distfileslocal/" \
EPREFIX=${EPREFIX} \
+ ${GENTOO_MIRRORS+GENTOO_MIRRORS=}${GENTOO_MIRRORS} \
${DOLOCAL+DOLOCAL=1} \
${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \
${RESUME+RESUME=1} \
@@ -170,6 +170,7 @@ case $1 in
echo "internal host, activating local and DOPUBLISH"
export DOLOCAL=1
export DOPUBLISH=1
+ export GENTOO_MIRRORS="http://distfileslocal/"
fi
for arg in "${@:2}" ; do
case "${arg}" in
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-06 11:09 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-06 11:09 UTC (permalink / raw
To: gentoo-commits
commit: 5d7ead7ca9a3d10fec3fa02f82d54be6524565dc
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 11:08:17 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 11:09:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d7ead7c
dobootstrap: allow targetting USE=libressl
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 00c3925684..35b693ddd4 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -119,6 +119,7 @@ do_prepare() {
GENTOO_MIRRORS="http://distfileslocal/" \
EPREFIX=${EPREFIX} \
${DOLOCAL+DOLOCAL=1} \
+ ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
@@ -170,6 +171,12 @@ case $1 in
export DOLOCAL=1
export DOPUBLISH=1
fi
+ for arg in "${@:2}" ; do
+ case "${arg}" in
+ libressl) export DOLIBRESSL=1 ;;
+ latesttree) export LATEST_TREE_YES=1 ;;
+ esac
+ done
do_prepare $1
;;
esac
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-06 11:09 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-06 11:09 UTC (permalink / raw
To: gentoo-commits
commit: 8941bb16307343e0a3199e17dc25b85dad84045f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 11:07:23 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 11:09:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8941bb16
dobootstrap: acknowledge theoretical posibility for ppc64-macos
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/dobootstrap | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 0073ab176e..00c3925684 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -55,7 +55,12 @@ do_prepare() {
fi
;;
powerpc-*)
- bitw=32
+ if [[ ${bitw} == 64 ]] ; then
+ chost=powerpc64-${chost#*-}
+ else
+ bitw=32
+ chost=powerpc-${chost#*-}
+ fi
;;
sparc-*)
if [[ ${bitw} == 64 ]] ; then
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-03-06 11:09 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-03-06 11:09 UTC (permalink / raw
To: gentoo-commits
commit: 99283251cb6a8f2f5a004b5024345f72a7023ecb
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 11:06:31 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 11:09:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=99283251
analyse_result: group archs by clumpsily sorting
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 516ead7f75..487b8c77c7 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -135,6 +135,8 @@ with os.scandir(resultsdir) as it:
endc = '\033[0m'
print("%s%24s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc))
+sarchs = sorted(archs, key=lambda a: '-'.join(a.split('-')[::-1]))
+
# generate html edition
with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<html>")
@@ -145,7 +147,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<th>architecture</th>")
h.write("<th>last successful run</th><th>last failed run</th>")
h.write("<th>failure</th>")
- for arch in archs:
+ for arch in sarchs:
fail, errcode, suc, et = archs[arch]
if not suc:
state = 'red'
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-02-21 16:36 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-02-21 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 15b0ca0a77aa326dd78904c0942c9d6f3a0a64aa
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 16:36:36 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 16:36:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=15b0ca0a
scripts/auto-bootstraps/analyse_result: fix python syntax
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 08762d5b9c..516ead7f75 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -118,11 +118,11 @@ with os.scandir(resultsdir) as it:
elapsedtime = None
if suc:
- elapsedf = os.path.join(resultsdir, arch, suc, "elapsedtime")
+ elapsedf = os.path.join(resultsdir, arch, "%s" % suc, "elapsedtime")
if os.path.exists(elapsedf):
with open(elapsedf, 'rb') as f:
l = f.readline()
- if l not is '':
+ if l is not '':
elapsedtime = int(l)
archs[arch] = (fail, state, suc, elapsedtime)
@@ -168,7 +168,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
etxt = ' (%.1f days)' % (et / 86400)
elif et > 3600:
etxt = ' (%.1f hours)' % (et / 3600)
- else
+ else:
etxt = ' (%d minutes)' % (et / 60)
h.write('<a href="%s/%s">%s</a>%s' % (arch, suc, suc, etxt))
else:
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-02-21 16:31 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-02-21 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 469d7fd1f99ae38627dbd3ef90877c85af56f96f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 16:30:58 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 16:31:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=469d7fd1
scripts/auto-bootstraps: try to keep timing information
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 24 +++++++++++++++++++++---
scripts/auto-bootstraps/dobootstrap | 4 ++++
scripts/auto-bootstraps/process_uploads.sh | 1 +
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
index 885c7fc9e7..08762d5b9c 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -115,7 +115,17 @@ with os.scandir(resultsdir) as it:
continue
arch = f.name
fail, state, suc = analyse_arch(os.path.join(resultsdir, arch))
- archs[arch] = (fail, state, suc)
+
+ elapsedtime = None
+ if suc:
+ elapsedf = os.path.join(resultsdir, arch, suc, "elapsedtime")
+ if os.path.exists(elapsedf):
+ with open(elapsedf, 'rb') as f:
+ l = f.readline()
+ if l not is '':
+ elapsedtime = int(l)
+
+ archs[arch] = (fail, state, suc, elapsedtime)
if not suc:
color = '\033[1;31m' # red
elif fail and suc < fail:
@@ -136,7 +146,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<th>last successful run</th><th>last failed run</th>")
h.write("<th>failure</th>")
for arch in archs:
- fail, errcode, suc = archs[arch]
+ fail, errcode, suc, et = archs[arch]
if not suc:
state = 'red'
elif fail and suc < fail:
@@ -152,7 +162,15 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h:
h.write("<td>")
if suc:
- h.write('<a href="%s/%s">%s</a>' % (arch, suc, suc))
+ etxt = ''
+ if et:
+ if et > 86400:
+ etxt = ' (%.1f days)' % (et / 86400)
+ elif et > 3600:
+ etxt = ' (%.1f hours)' % (et / 3600)
+ else
+ etxt = ' (%d minutes)' % (et / 60)
+ h.write('<a href="%s/%s">%s</a>%s' % (arch, suc, suc, etxt))
else:
h.write('<i>never</i>')
h.write("</td>")
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 521f644acf..0073ab176e 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -104,6 +104,7 @@ do_prepare() {
keepalive=$(type -P caffeinate)
[[ -x ${keepalive} ]] && keepalive+=" -i -m -s" || keepalive=
+ starttime=${SECONDS}
env -i \
HOME=${EPREFIX} \
SHELL=/bin/bash \
@@ -117,8 +118,10 @@ do_prepare() {
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
${keepalive} /bin/bash -l -c "${BASH} ${bootstrapscript} bootstrap"
+ endtime=${SECONDS}
if [[ -n ${DOPUBLISH} ]] ; then
+ echo $((endtime - starttime)) > elapsedtime
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
rsync -rltv \
@@ -130,6 +133,7 @@ do_prepare() {
{stage,.stage}* \
bootstrap-prefix.sh \
startprefix \
+ elapsedtime \
usr/portage/distfiles \
var/tmp/portage \
var/log/emerge.log \
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
index 52bb09ed7f..402f9e4ae6 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -35,6 +35,7 @@ for d in ${UPLOADDIR}/* ; do
bootstrap-prefix.sh \
emerge.log \
startprefix \
+ elapsedtime \
distfiles ;
do
[[ -e "${d}/${dir}/${f}" ]] && \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
@ 2019-02-21 11:38 Fabian Groffen
0 siblings, 0 replies; 66+ messages in thread
From: Fabian Groffen @ 2019-02-21 11:38 UTC (permalink / raw
To: gentoo-commits
commit: b7c0b89992e7b3673ad3e3ba667b81ce9868b69c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 11:37:09 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 11:37:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b7c0b899
scripts/auto-bootstraps: scripts to perform unattended bootstraps
This includes the scripts that generate the results output of
bootstrap.prefix.bitzolder.nl.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 178 ++++++++++++++++++++++++++++
scripts/auto-bootstraps/dobootstrap | 167 ++++++++++++++++++++++++++
scripts/auto-bootstraps/process_uploads.sh | 60 ++++++++++
scripts/auto-bootstraps/update_distfiles.py | 29 +++++
4 files changed, 434 insertions(+)
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py
new file mode 100755
index 0000000000..885c7fc9e7
--- /dev/null
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+
+import os
+import glob
+import re
+import time
+import html
+
+resultsdir='./results'
+
+def find_last_stage(d):
+ """
+ Returns the last stage worked on.
+ Bootstraps define explicitly stages 1, 2 and 3, we define some more
+ on top of those as follows:
+ 0 - bootstrap didn't even start (?!?) or unknown status
+ 1 - stage 1 failed
+ 2 - stage 2 failed
+ 3 - stage 3 failed
+ 4 - emerge -e world failed
+ 5 - finished successfully
+ """
+
+ def stage_success(stagelog):
+ with open(stagelog, 'rb') as f:
+ line = f.readlines()[-1]
+ res = re.match(r'^\* stage[123] successfully finished',
+ line.decode('utf-8', 'ignore'))
+ return res is not None
+
+ if not os.path.exists(os.path.join(d, '.stage1-finished')):
+ log = os.path.join(d, 'stage1.log')
+ if not os.path.exists(log):
+ return 0 # nothing exists, assume not started
+ if not stage_success(log):
+ return 1
+
+ if not os.path.exists(os.path.join(d, '.stage2-finished')):
+ log = os.path.join(d, 'stage2.log')
+ if not os.path.exists(log) or not stage_success(log):
+ return 2 # stage1 was success, so 2 must have failed
+
+ if not os.path.exists(os.path.join(d, '.stage3-finished')):
+ log = os.path.join(d, 'stage3.log')
+ if not os.path.exists(log) or not stage_success(log):
+ return 3 # stage2 was success, so 3 must have failed
+
+ # if stage 3 was success, we went onto emerge -e system, if that
+ # failed, portage would have left a build.log behind
+ logs = glob.glob(d + "/portage/*/*/temp/build.log")
+ if len(logs) > 0:
+ return 4
+
+ # ok, so it must have been all good then
+ return 5
+
+def get_err_reason(arch, dte, err):
+ rdir = os.path.join(resultsdir, arch, '%d' % dte)
+
+ if err == 0:
+ return "bootstrap failed to start"
+ if err >= 1 and err <= 3:
+ stagelog = os.path.join(rdir, 'stage%d.log' % err)
+ if os.path.exists(stagelog):
+ line = None
+ with open(stagelog, 'rb') as f:
+ errexp = re.compile(r'^( \* (ERROR:|Fetch failed for)|emerge: there are no) ')
+ for line in f:
+ res = errexp.match(line.decode('utf-8', 'ignore'))
+ if res:
+ break
+ if not line:
+ return '<a href="%s/stage%d.log">stage %d</a> failed' % \
+ (os.path.join(arch, '%d' % dte), err, err)
+ return '<a href="%s/stage%d.log">stage %d</a> failed<br />%s' % \
+ (os.path.join(arch, '%d' % dte), err, err, \
+ html.escape(line.decode('utf-8', 'ignore')))
+ else:
+ return 'stage %d did not start' % err
+ if err == 4:
+ msg = "'emerge -e system' failed while emerging"
+ logs = glob.glob(rdir + "/portage/*/*/temp/build.log")
+ for log in logs:
+ cat, pkg = log.split('/')[-4:-2]
+ msg = msg + ' <a href="%s/temp/build.log">%s/%s</a>' % \
+ (os.path.join(arch, '%d' % dte, "portage", cat, pkg), \
+ cat, pkg)
+ return msg
+
+def analyse_arch(d):
+ last_fail = None
+ last_succ = None
+ fail_state = None
+ with os.scandir(d) as it:
+ for f in sorted(it, key=lambda x: (x.is_dir(), x.name), reverse=True):
+ if not f.is_dir(follow_symlinks=False):
+ continue
+ date = int(f.name)
+ res = find_last_stage(os.path.join(d, f.name))
+ if res == 5:
+ if not last_succ:
+ last_succ = date
+ elif not last_fail:
+ last_fail = date
+ fail_state = res
+ if last_succ and last_fail:
+ break
+
+ return (last_fail, fail_state, last_succ)
+
+archs = {}
+with os.scandir(resultsdir) as it:
+ for f in sorted(it, key=lambda x: (x.is_dir(), x.name)):
+ if not f.is_dir(follow_symlinks=False):
+ continue
+ arch = f.name
+ fail, state, suc = analyse_arch(os.path.join(resultsdir, arch))
+ archs[arch] = (fail, state, suc)
+ if not suc:
+ color = '\033[1;31m' # red
+ elif fail and suc < fail:
+ color = '\033[1;33m' # yellow
+ else:
+ color = '\033[1;32m' # green
+ endc = '\033[0m'
+ print("%s%24s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc))
+
+# generate html edition
+with open(os.path.join(resultsdir, 'index.html'), "w") as h:
+ h.write("<html>")
+ h.write("<head><title>Gentoo Prefix bootstrap results</title></head>")
+ h.write("<body>")
+ h.write("<h2>Gentoo Prefix bootstraps</h2>")
+ h.write('<table border="1px">')
+ h.write("<th>architecture</th>")
+ h.write("<th>last successful run</th><th>last failed run</th>")
+ h.write("<th>failure</th>")
+ for arch in archs:
+ fail, errcode, suc = archs[arch]
+ if not suc:
+ state = 'red'
+ elif fail and suc < fail:
+ state = 'orange'
+ else:
+ state = 'limegreen'
+
+ h.write('<tr>')
+
+ h.write('<td bgcolor="%s" nowrap="nowrap">' % state)
+ h.write(arch)
+ h.write("</td>")
+
+ h.write("<td>")
+ if suc:
+ h.write('<a href="%s/%s">%s</a>' % (arch, suc, suc))
+ else:
+ h.write('<i>never</i>')
+ h.write("</td>")
+
+ h.write("<td>")
+ if fail:
+ h.write('<a href="%s/%s">%s</a>' % (arch, fail, fail))
+ else:
+ h.write('<i>never</i>')
+ h.write("</td>")
+
+ h.write("<td>")
+ if fail and (not suc or fail > suc):
+ h.write(get_err_reason(arch, fail, errcode))
+ h.write("</td>")
+
+ h.write("</tr>")
+ h.write("</table>")
+ now = time.strftime('%Y-%m-%d %H:%M', time.gmtime())
+ h.write("<p><i>generated: %s</i></p>" % now)
+ h.write("<p>See also <a href='https://dev.azure.com/12719821/12719821/_build?definitionId=6'>awesomebytes</a></p>")
+ h.write("</body>")
+ h.write("</html>")
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
new file mode 100755
index 0000000000..521f644acf
--- /dev/null
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -0,0 +1,167 @@
+#!/usr/bin/env bash
+
+BOOTSTRAP="${BASH_SOURCE[0]%/*}/bootstrap-prefix.sh"
+BOOTURL="http://rsync.prefix.bitzolder.nl/scripts/bootstrap-prefix.sh"
+UPLOAD="rsync1.prefix.bitzolder.nl::gentoo-portage-bootstraps"
+
+do_fetch() {
+ local FETCHCOMMAND
+ # Try to find a download manager, we only deal with wget,
+ # curl, FreeBSD's fetch and ftp.
+ if [[ x$(type -t wget) == "xfile" ]] ; then
+ FETCH_COMMAND="wget -O -"
+ [[ $(wget -h) == *"--no-check-certificate"* ]] && \
+ FETCH_COMMAND+=" --no-check-certificate"
+ elif [[ x$(type -t curl) == "xfile" ]] ; then
+ FETCH_COMMAND="curl -f -L"
+ else
+ echo "could not download ${1##*/}"
+ exit 1
+ fi
+
+ ${FETCH_COMMAND} "${*}" || exit 1
+}
+
+do_prepare() {
+ local bitw=$1
+ local dte=$2
+ local bootstrap
+
+ if [[ -n ${RESUME} && -n ${bitw} && -n ${dte} ]] ; then
+ bootstrap=bootstrap${bitw}-${dte}/bootstrap-prefix.sh
+ elif [[ -n ${DOLOCAL} ]] ; then
+ bootstrap=${BOOTSTRAP}
+ else
+ bootstrap=dobootstrap-do_prepare-$$
+ do_fetch ${BOOTURL} > ${bootstrap}
+ fi
+
+ local chost=$(${BASH} ${bootstrap} chost.guess x)
+ case ${chost} in
+ *86-*)
+ if [[ ${bitw} == 64 ]] ; then
+ chost=x86_64-${chost#*-}
+ else
+ bitw=32
+ chost=i386-${chost#*-}
+ fi
+ ;;
+ x86_64-*)
+ if [[ ${bitw} == 32 ]] ; then
+ chost=i386-${chost#*-}
+ else
+ bitw=64
+ chost=x86_64-${chost#*-}
+ fi
+ ;;
+ powerpc-*)
+ bitw=32
+ ;;
+ sparc-*)
+ if [[ ${bitw} == 64 ]] ; then
+ chost=sparcv9-${chost#*-}
+ else
+ bitw=32
+ chost=sparc-${chost#*-}
+ fi
+ ;;
+ sparcv9-*|sparc64-*)
+ if [[ ${bitw} == 32 ]] ; then
+ chost=sparc-${chost#*-}
+ else
+ bitw=64
+ chost=sparcv9-${chost#*-}
+ fi
+ ;;
+ *)
+ echo "unhandled CHOST: ${chost}"
+ rm -f dobootstrap-do_prepare-$$
+ exit 1
+ ;;
+ esac
+
+ [[ -z ${dte} ]] && dte=$(date "+%Y%m%d")
+ EPREFIX=${PWD}/bootstrap${bitw}-${dte}
+ [[ -n ${OVERRIDE_EPREFIX} ]] && EPREFIX=${OVERRIDE_EPREFIX}
+
+ local bootstrapscript=$(realpath ${BASH_SOURCE[0]} 2>/dev/null)
+ if [[ -z ${bootstrapscript} ]] ; then
+ local b=${BASH_SOURCE[0]}
+ cd "${b%/*}"
+ bootstrapscript=$(pwd -P)/${b##*/}
+ fi
+ echo "EPREFIX=${EPREFIX}"
+ mkdir -p "${EPREFIX}"
+ if [[ ${bootstrap} == dobootstrap-do_prepare-$$ ]] ; then
+ mv "${bootstrap}" "${EPREFIX}"/bootstrap-prefix.sh
+ elif [[ ${bootstrap} != "${EPREFIX}"/bootstrap-prefix.sh ]] ; then
+ cp "${bootstrap}" "${EPREFIX}"/bootstrap-prefix.sh
+ fi
+ cd "${EPREFIX}" || exit 1
+
+ # optional program to keep the machine from sleeping
+ # macOS/BSD: caffeinate
+ keepalive=$(type -P caffeinate)
+ [[ -x ${keepalive} ]] && keepalive+=" -i -m -s" || keepalive=
+
+ env -i \
+ HOME=${EPREFIX} \
+ SHELL=/bin/bash \
+ TERM=${TERM} \
+ USER=${USER} \
+ CHOST=${chost} \
+ GENTOO_MIRRORS="http://distfileslocal/" \
+ EPREFIX=${EPREFIX} \
+ ${DOLOCAL+DOLOCAL=1} \
+ ${RESUME+RESUME=1} \
+ ${LATEST_TREE_YES+LATEST_TREE_YES=1} \
+ ${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
+ ${keepalive} /bin/bash -l -c "${BASH} ${bootstrapscript} bootstrap"
+
+ if [[ -n ${DOPUBLISH} ]] ; then
+ rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
+ rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
+ rsync -rltv \
+ --exclude=work/ \
+ --exclude=homedir/ \
+ --exclude=files \
+ --exclude=distdir/ \
+ --exclude=image/ \
+ {stage,.stage}* \
+ bootstrap-prefix.sh \
+ startprefix \
+ usr/portage/distfiles \
+ var/tmp/portage \
+ var/log/emerge.log \
+ ${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/
+ rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/${dte}/push-complete/
+ fi
+}
+
+do_bootstrap() {
+ chmod 755 bootstrap-prefix.sh || exit 1
+ ${BASH} ./bootstrap-prefix.sh ${EPREFIX} noninteractive
+}
+
+case $1 in
+ bootstrap)
+ do_bootstrap
+ ;;
+ local)
+ export DOLOCAL=1
+ do_prepare $2
+ ;;
+ resume)
+ export RESUME=1
+ do_prepare "$2" ${3:-${BOOTSTRAP_DATE}}
+ ;;
+ *)
+ if [[ ${0} == /net/* ]] ; then
+ echo "internal host, activating local and DOPUBLISH"
+ export DOLOCAL=1
+ export DOPUBLISH=1
+ fi
+ do_prepare $1
+ ;;
+esac
+
diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh
new file mode 100755
index 0000000000..52bb09ed7f
--- /dev/null
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+UPLOADDIR="./uploads"
+RESULTSDIR="./results"
+
+didsomething=
+for d in ${UPLOADDIR}/* ; do
+ if [[ ! -d "${d}" ]] ; then
+ rm -f "${d}"
+ continue
+ fi
+
+ # structure: randomid/chost/date
+ # chost/date should be the only thing in randomid/ check this
+ set -- "${d}"/*/*
+ if [[ $# -ne 1 ]] || [[ ! -d "$1" ]] ; then
+ rm -Rf "${d}"
+ continue
+ fi
+
+ dir=${1#${d}/}
+ # skip this thing from auto-processing if it is new platform
+ [[ -d ${RESULTSDIR}/${dir%/*} ]] || continue
+ # skip this thing if it already exists
+ [[ -d ${RESULTSDIR}/${dir} ]] && continue
+ # skip this thing if it isn't complete yet
+ [[ -d ${d}/${dir}/push-complete ]] || continue
+
+ # only copy over what we expect, so we leave any uploaded cruft
+ # behind
+ mkdir "${RESULTSDIR}/${dir}"
+ for f in \
+ stage{1,2,3}.log \
+ .stage{1,2,3}-finished \
+ bootstrap-prefix.sh \
+ emerge.log \
+ startprefix \
+ distfiles ;
+ do
+ [[ -e "${d}/${dir}/${f}" ]] && \
+ mv "${d}/${dir}/${f}" "${RESULTSDIR}/${dir}"/
+ done
+ if [[ -e "${d}/${dir}/portage" ]] ; then
+ for pkg in "${d}/${dir}/portage"/*/* ; do
+ w=${pkg#${d}/}
+ mkdir -p "${RESULTSDIR}/${w}"
+ [[ -e "${pkg}"/build-info ]] && \
+ mv "${pkg}"/build-info "${RESULTSDIR}/${w}"/
+ [[ -e "${pkg}"/temp ]] && \
+ mv "${pkg}"/temp "${RESULTSDIR}/${w}"/
+ done
+ fi
+ chmod -R o+rX,go-w "${RESULTSDIR}/${dir}"
+ rm -Rf "${d}"
+
+ [[ -e "${RESULTSDIR}/${dir}"/distfiles ]] && \
+ ./update_distfiles.py "${RESULTSDIR}/${dir}"/distfiles > /dev/null
+ didsomething=1
+done
+[[ -n ${didsomething} ]] && ./analyse_result.py > /dev/null
diff --git a/scripts/auto-bootstraps/update_distfiles.py b/scripts/auto-bootstraps/update_distfiles.py
new file mode 100755
index 0000000000..8f44f7fa20
--- /dev/null
+++ b/scripts/auto-bootstraps/update_distfiles.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3.6
+
+import hashlib
+import os
+import sys
+
+distfilessrc='./distfiles'
+
+def hash_file(f):
+ hsh = hashlib.new('sha1')
+ with open(f, 'rb') as fle:
+ hsh.update(fle.read())
+ return hsh.hexdigest()
+
+with os.scandir(path=sys.argv[1]) as it:
+ for f in it:
+ if not f.is_file() or f.name.startswith('.'):
+ continue
+ srcfile = os.path.join(sys.argv[1], f.name)
+ h = hash_file(srcfile)
+ distname = os.path.join(distfilessrc,
+ f.name + "@" + h).lower()
+ if os.path.exists(distname):
+ print("DUP %s" % distname.split('/')[-1])
+ os.remove(srcfile)
+ os.link(distname, srcfile, follow_symlinks=False)
+ else:
+ print("NEW %s" % distname.split('/')[-1])
+ os.link(srcfile, distname)
^ permalink raw reply related [flat|nested] 66+ messages in thread
end of thread, other threads:[~2024-06-16 7:47 UTC | newest]
Thread overview: 66+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-09 15:19 [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2024-06-16 7:47 Fabian Groffen
2024-04-05 15:09 Fabian Groffen
2024-04-05 11:45 Fabian Groffen
2024-04-02 17:31 Fabian Groffen
2024-03-30 12:13 Fabian Groffen
2024-03-28 16:12 Fabian Groffen
2024-03-02 12:57 Fabian Groffen
2024-02-24 9:10 Fabian Groffen
2024-02-05 11:54 Fabian Groffen
2024-01-29 18:59 Fabian Groffen
2024-01-15 10:37 Fabian Groffen
2024-01-14 10:48 Fabian Groffen
2024-01-14 10:46 Fabian Groffen
2024-01-14 10:46 Fabian Groffen
2023-08-31 6:36 Fabian Groffen
2023-06-20 9:08 Fabian Groffen
2023-06-20 8:34 Fabian Groffen
2023-05-31 9:19 Fabian Groffen
2023-05-30 6:01 Fabian Groffen
2023-05-26 14:33 Fabian Groffen
2023-05-26 14:30 Fabian Groffen
2022-05-31 11:10 Fabian Groffen
2022-05-31 9:16 Fabian Groffen
2021-12-30 12:25 Fabian Groffen
2021-12-07 8:35 Fabian Groffen
2021-02-20 14:19 Fabian Groffen
2021-02-05 17:48 Fabian Groffen
2021-01-17 18:42 Fabian Groffen
2021-01-10 10:53 Fabian Groffen
2021-01-05 19:09 Fabian Groffen
2021-01-05 19:09 Fabian Groffen
2020-12-09 12:20 Fabian Groffen
2020-12-08 7:26 Fabian Groffen
2020-11-28 10:03 Fabian Groffen
2020-11-28 10:02 Fabian Groffen
2020-11-27 10:58 Fabian Groffen
2020-11-27 10:58 Fabian Groffen
2020-11-24 9:27 Fabian Groffen
2020-06-07 12:12 Fabian Groffen
2020-06-01 8:56 Fabian Groffen
2020-06-01 8:37 Fabian Groffen
2020-06-01 7:47 Fabian Groffen
2019-07-14 9:07 Fabian Groffen
2019-07-02 9:37 Fabian Groffen
2019-07-02 9:37 Fabian Groffen
2019-07-02 9:04 Fabian Groffen
2019-06-21 19:01 Fabian Groffen
2019-06-18 10:42 Fabian Groffen
2019-06-16 18:44 Fabian Groffen
2019-06-14 9:30 Fabian Groffen
2019-06-14 7:50 Fabian Groffen
2019-06-13 19:21 Fabian Groffen
2019-06-06 18:56 Fabian Groffen
2019-05-22 20:12 Fabian Groffen
2019-05-22 17:33 Fabian Groffen
2019-03-22 14:13 Fabian Groffen
2019-03-14 8:15 Fabian Groffen
2019-03-06 11:24 Fabian Groffen
2019-03-06 11:18 Fabian Groffen
2019-03-06 11:09 Fabian Groffen
2019-03-06 11:09 Fabian Groffen
2019-03-06 11:09 Fabian Groffen
2019-02-21 16:36 Fabian Groffen
2019-02-21 16:31 Fabian Groffen
2019-02-21 11:38 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox