commit: 125a20d22f7e7997f038afb3c8441a4aa8cd5844
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 1 10:53:20 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 1 10:53:20 2023 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=125a20d2
Add untested config for arm64 builder
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/jiji/binhost-update | 113 +++++++++++++++++++++
builders/jiji/gnome/portage/make.conf | 35 +++++++
builders/jiji/gnome/portage/make.profile | 1 +
builders/jiji/gnome/portage/package.use/bindist | 2 +
.../jiji/gnome/portage/package.use/dist-kernel | 1 +
builders/jiji/gnome/portage/package.use/fixed | 6 ++
builders/jiji/gnome/portage/package.use/queued | 1 +
builders/jiji/gnome/portage/package.use/zlib | 1 +
builders/jiji/gnome/run-update | 10 ++
builders/jiji/gnome/world | 30 ++++++
builders/jiji/kde/portage/make.conf | 35 +++++++
builders/jiji/kde/portage/make.profile | 1 +
builders/jiji/kde/portage/package.use/bindist | 2 +
builders/jiji/kde/portage/package.use/dist-kernel | 1 +
builders/jiji/kde/portage/package.use/ffmpeg | 1 +
builders/jiji/kde/portage/package.use/fixed | 6 ++
builders/jiji/kde/portage/package.use/queued | 2 +
builders/jiji/kde/run-update | 12 +++
builders/jiji/kde/world | 42 ++++++++
builders/jiji/server/portage/make.conf | 35 +++++++
builders/jiji/server/portage/make.profile | 1 +
.../jiji/server/portage/package.use/dist-kernel | 1 +
builders/jiji/server/run-update | 10 ++
builders/jiji/server/world | 9 ++
24 files changed, 358 insertions(+)
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
new file mode 100755
index 0000000..e5f8e86
--- /dev/null
+++ b/builders/jiji/binhost-update
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+BINHOST_NAME=arm64/17.0/arm64
+_BINHOST_NAME=$(echo ${BINHOST_NAME}|sed -e 's:/:_:g')
+
+TMPFILE="/root/.tmp-binhost-${_BINHOST_NAME}-update-$(date +%s)"
+LOCKFILE="/root/.tmp-binhost-${_BINHOST_NAME}-lock"
+
[email protected]
[email protected]
+
+NSPAWN_NAMES="binhost-arm64-kde binhost-arm64-gnome binhost-arm64-server"
+
+MAX_HARMLESS=150
+
+UPLOAD_USER=arm64
+UPLOAD_KEY=/root/.ssh/id_ed25519
+
+
+send_email() {
+ local subject="[binhost ${BINHOST_NAME}] $1"
+ local message=$2
+ local logfile=$3
+ local body
+
+ if [ -n "${logfile}" ]; then
+ body=$(printf '%b\n\n\n' "${message}"; tail -n 500
"${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
+ else
+ body=${message}
+ fi
+
+ printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
+ "${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
+ /usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
+}
+
+upsync_binpackages() {
+ # parameter 1: a PKGDIR on the local host
+ # parameter 2: the target dir in the mirroring system, should be of the
+ # form arch/profileversion/name (e.g., amd64/17.0/x32 )
+ echo Upsyncing binpackages from $1 to $2
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ -o IPQoS=cs0
+ )
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --delete
+ --delete-after
+ --omit-dir-times
+ --delay-updates
+ --mkpath
+ )
+ rsync "${RSYNC_OPTS[@]}" "$1"/*
"${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
+}
+
+verify_dnssec() {
+ which dig >/dev/null || {
+ echo "net-dns/bind-tools is needed to verify DNSSEC is working"
+ exit 1
+ }
+
+ if ! dig +noall +comments dev.gentoo.org. IN SSHFP | egrep -q '^;;
flags: [ a-z]+\<ad\>'; then
+ echo "DNSSEC does not appear to be working. Bailing out"
+ exit 1
+ fi
+
+ if ! grep -q '^options\>.*\<edns0\>' /etc/resolv.conf; then
+ echo "DNSSEC is not enabled in /etc/resolv.conf"
+ exit 1
+ fi
+}
+
+
+
+if [[ -f ${LOCKFILE} ]] ; then
+ echo "lockfile ${LOCKFILE} exists, aborting"
+ exit 111
+fi
+touch ${LOCKFILE} || exit 112
+
+verify_dnssec
+
+
+
+echo Starting run at $(date -u) > ${TMPFILE}
+
+for n in ${NSPAWN_NAMES} ; do
+ echo Machine ${n} &>> ${TMPFILE}
+ echo &>> ${TMPFILE}
+ cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
+ git pull -q &>> ${TMPFILE}
+ cd /root &>> ${TMPFILE}
+ systemd-nspawn -M ${n} /root/bin/run-update &>> ${TMPFILE}
+done
+
+
+upsync_binpackages /var/lib/machines/binhost-arm64-kde/var/cache/binpkgs
arm64/17.0/arm64 &>> ${TMPFILE}
+
+
+if [[ $(wc -l ${TMPFILE} | sed -e 's: .*$::g') -gt ${MAX_HARMLESS} ]] ; then
+
+ send_email "Update possibly failed" "Binhost ${BINHOST_NAME} update produced
long output" ${TMPFILE}
+
+fi
+
+
+rm ${LOCKFILE}
diff --git a/builders/jiji/gnome/portage/make.conf
b/builders/jiji/gnome/portage/make.conf
new file mode 100644
index 0000000..f4b8524
--- /dev/null
+++ b/builders/jiji/gnome/portage/make.conf
@@ -0,0 +1,35 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+COMMON_FLAGS="-O2 -pipe"
+CFLAGS="${COMMON_FLAGS}"
+CXXFLAGS="${COMMON_FLAGS}"
+FCFLAGS="${COMMON_FLAGS}"
+FFLAGS="${COMMON_FLAGS}"
+
+# NOTE: This stage was built with the bindist Use flag enabled
+PORTDIR="/var/db/repos/gentoo"
+DISTDIR="/var/cache/distfiles"
+PKGDIR="/var/cache/binpkgs"
+
+# This sets the language of build output to English.
+# Please keep this setting intact when reporting bugs.
+LC_MESSAGES=C
+
+MAKEOPTS="-j17 --load 17.0"
+
+EMERGE_DEFAULT_OPTS="--jobs 5 --keep-going --binpkg-respect-use --usepkg
--with-bdeps=y --color n --nospinner"
+
+FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+
+BINPKG_FORMAT="gpkg"
+
+USE="bindist"
+
+ACCEPT_RESTRICT="* -bindist"
+
+ACCEPT_LICENSE="@FREE MPEG-4"
+
+LC_ALL="en_US.utf8"
+
diff --git a/builders/jiji/gnome/portage/make.profile
b/builders/jiji/gnome/portage/make.profile
new file mode 120000
index 0000000..fc2c0f6
--- /dev/null
+++ b/builders/jiji/gnome/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/arm64/17.0/desktop/gnome/systemd
\ No newline at end of file
diff --git a/builders/jiji/gnome/portage/package.use/bindist
b/builders/jiji/gnome/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/jiji/gnome/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/jiji/gnome/portage/package.use/dist-kernel
b/builders/jiji/gnome/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/jiji/gnome/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/jiji/gnome/portage/package.use/fixed
b/builders/jiji/gnome/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/jiji/gnome/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/jiji/gnome/portage/package.use/queued
b/builders/jiji/gnome/portage/package.use/queued
new file mode 100644
index 0000000..49491b2
--- /dev/null
+++ b/builders/jiji/gnome/portage/package.use/queued
@@ -0,0 +1 @@
+media-libs/libvpx postproc
diff --git a/builders/jiji/gnome/portage/package.use/zlib
b/builders/jiji/gnome/portage/package.use/zlib
new file mode 100644
index 0000000..b934da8
--- /dev/null
+++ b/builders/jiji/gnome/portage/package.use/zlib
@@ -0,0 +1 @@
+sys-libs/zlib minizip
diff --git a/builders/jiji/gnome/run-update b/builders/jiji/gnome/run-update
new file mode 100755
index 0000000..b57dd1a
--- /dev/null
+++ b/builders/jiji/gnome/run-update
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# if one thing fails, abort entirely
+set -e
+
+emerge --sync -q
+
+emerge -uDNkq --changed-deps world
+
+emerge --depclean --quiet-unmerge-warn
diff --git a/builders/jiji/gnome/world b/builders/jiji/gnome/world
new file mode 100644
index 0000000..a972244
--- /dev/null
+++ b/builders/jiji/gnome/world
@@ -0,0 +1,30 @@
+app-editors/emacs
+app-editors/nano
+app-editors/vim
+app-office/libreoffice
+app-office/texstudio
+app-officeext/texmaths
+app-portage/eix
+app-text/pdftk
+app-text/xournalpp
+dev-tex/latex-beamer
+gnome-base/gnome
+gnome-base/gnome-extra-apps
+media-gfx/engauge
+media-gfx/gimp
+media-gfx/gnuclad
+media-gfx/inkscape
+media-gfx/povray
+media-sound/clementine
+net-firewall/fwbuilder
+net-irc/quassel
+net-misc/chrony
+net-misc/dhcpcd
+net-vpn/openvpn
+sci-visualization/gnuplot
+sci-visualization/gwyddion
+sci-visualization/spyview
+sys-apps/portage
+sys-devel/clang
+sys-devel/gdb
+www-client/firefox
diff --git a/builders/jiji/kde/portage/make.conf
b/builders/jiji/kde/portage/make.conf
new file mode 100644
index 0000000..f4b8524
--- /dev/null
+++ b/builders/jiji/kde/portage/make.conf
@@ -0,0 +1,35 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+COMMON_FLAGS="-O2 -pipe"
+CFLAGS="${COMMON_FLAGS}"
+CXXFLAGS="${COMMON_FLAGS}"
+FCFLAGS="${COMMON_FLAGS}"
+FFLAGS="${COMMON_FLAGS}"
+
+# NOTE: This stage was built with the bindist Use flag enabled
+PORTDIR="/var/db/repos/gentoo"
+DISTDIR="/var/cache/distfiles"
+PKGDIR="/var/cache/binpkgs"
+
+# This sets the language of build output to English.
+# Please keep this setting intact when reporting bugs.
+LC_MESSAGES=C
+
+MAKEOPTS="-j17 --load 17.0"
+
+EMERGE_DEFAULT_OPTS="--jobs 5 --keep-going --binpkg-respect-use --usepkg
--with-bdeps=y --color n --nospinner"
+
+FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+
+BINPKG_FORMAT="gpkg"
+
+USE="bindist"
+
+ACCEPT_RESTRICT="* -bindist"
+
+ACCEPT_LICENSE="@FREE MPEG-4"
+
+LC_ALL="en_US.utf8"
+
diff --git a/builders/jiji/kde/portage/make.profile
b/builders/jiji/kde/portage/make.profile
new file mode 120000
index 0000000..7af4278
--- /dev/null
+++ b/builders/jiji/kde/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/arm64/17.0/desktop/plasma/systemd
\ No newline at end of file
diff --git a/builders/jiji/kde/portage/package.use/bindist
b/builders/jiji/kde/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/jiji/kde/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/jiji/kde/portage/package.use/dist-kernel
b/builders/jiji/kde/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/jiji/kde/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/jiji/kde/portage/package.use/ffmpeg
b/builders/jiji/kde/portage/package.use/ffmpeg
new file mode 100644
index 0000000..aad80a4
--- /dev/null
+++ b/builders/jiji/kde/portage/package.use/ffmpeg
@@ -0,0 +1 @@
+media-video/ffmpeg libass
diff --git a/builders/jiji/kde/portage/package.use/fixed
b/builders/jiji/kde/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/jiji/kde/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/jiji/kde/portage/package.use/queued
b/builders/jiji/kde/portage/package.use/queued
new file mode 100644
index 0000000..7c78837
--- /dev/null
+++ b/builders/jiji/kde/portage/package.use/queued
@@ -0,0 +1,2 @@
+media-libs/libvpx postproc
+dev-qt/qtpositioning geoclue
diff --git a/builders/jiji/kde/run-update b/builders/jiji/kde/run-update
new file mode 100755
index 0000000..d09260e
--- /dev/null
+++ b/builders/jiji/kde/run-update
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# if one thing fails, abort entirely
+set -e
+
+emerge --sync -q
+
+emerge -uDNkq --changed-deps world
+
+emerge --depclean --quiet-unmerge-warn
+
+eclean-pkg -C -t2m
diff --git a/builders/jiji/kde/world b/builders/jiji/kde/world
new file mode 100644
index 0000000..739d171
--- /dev/null
+++ b/builders/jiji/kde/world
@@ -0,0 +1,42 @@
+app-containers/docker
+app-editors/emacs
+app-editors/kile
+app-editors/nano
+app-office/abiword
+app-office/gnucash
+app-office/kmymoney
+app-office/libreoffice
+app-office/scribus
+app-office/texstudio
+app-officeext/texmaths
+app-portage/eix
+app-portage/gentoolkit
+app-text/pdftk
+app-text/xournalpp
+dev-tex/latex-beamer
+dev-util/kdevelop
+kde-apps/kde-apps-meta
+kde-apps/kdepim-meta
+kde-plasma/plasma-meta
+media-gfx/engauge
+media-gfx/gimp
+media-gfx/gnuclad
+media-gfx/inkscape
+media-gfx/krita
+media-gfx/povray
+media-sound/strawberry
+media-video/kaffeine
+net-firewall/fwbuilder
+net-irc/quassel
+net-misc/chrony
+net-misc/dhcpcd
+net-vpn/openvpn
+sci-electronics/klayout
+sci-visualization/gnuplot
+sci-visualization/gwyddion
+sci-visualization/spyview
+sys-apps/portage
+sys-devel/clang
+sys-devel/gdb
+www-client/firefox
+www-servers/apache
diff --git a/builders/jiji/server/portage/make.conf
b/builders/jiji/server/portage/make.conf
new file mode 100644
index 0000000..f4b8524
--- /dev/null
+++ b/builders/jiji/server/portage/make.conf
@@ -0,0 +1,35 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+COMMON_FLAGS="-O2 -pipe"
+CFLAGS="${COMMON_FLAGS}"
+CXXFLAGS="${COMMON_FLAGS}"
+FCFLAGS="${COMMON_FLAGS}"
+FFLAGS="${COMMON_FLAGS}"
+
+# NOTE: This stage was built with the bindist Use flag enabled
+PORTDIR="/var/db/repos/gentoo"
+DISTDIR="/var/cache/distfiles"
+PKGDIR="/var/cache/binpkgs"
+
+# This sets the language of build output to English.
+# Please keep this setting intact when reporting bugs.
+LC_MESSAGES=C
+
+MAKEOPTS="-j17 --load 17.0"
+
+EMERGE_DEFAULT_OPTS="--jobs 5 --keep-going --binpkg-respect-use --usepkg
--with-bdeps=y --color n --nospinner"
+
+FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+
+BINPKG_FORMAT="gpkg"
+
+USE="bindist"
+
+ACCEPT_RESTRICT="* -bindist"
+
+ACCEPT_LICENSE="@FREE MPEG-4"
+
+LC_ALL="en_US.utf8"
+
diff --git a/builders/jiji/server/portage/make.profile
b/builders/jiji/server/portage/make.profile
new file mode 120000
index 0000000..b26bce1
--- /dev/null
+++ b/builders/jiji/server/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/arm64/17.0
\ No newline at end of file
diff --git a/builders/jiji/server/portage/package.use/dist-kernel
b/builders/jiji/server/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/jiji/server/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/jiji/server/run-update b/builders/jiji/server/run-update
new file mode 100755
index 0000000..b57dd1a
--- /dev/null
+++ b/builders/jiji/server/run-update
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# if one thing fails, abort entirely
+set -e
+
+emerge --sync -q
+
+emerge -uDNkq --changed-deps world
+
+emerge --depclean --quiet-unmerge-warn
diff --git a/builders/jiji/server/world b/builders/jiji/server/world
new file mode 100644
index 0000000..3555899
--- /dev/null
+++ b/builders/jiji/server/world
@@ -0,0 +1,9 @@
+app-containers/docker
+app-editors/nano
+app-portage/gentoolkit
+net-misc/chrony
+net-misc/dhcpcd
+net-vpn/openvpn
+sys-apps/portage
+sys-devel/clang
+www-servers/apache
