commit: 891c01ca4123831cba7b66f6c142744c7f7a5088
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 18:29:43 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 18:29:43 2023 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=891c01ca
Add some fancy stuff
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
builders/demeter/binhost-update | 13 +++---
builders/demeter/gnome-v3/portage/make.conf | 35 +++++++++++++++
builders/demeter/gnome-v3/portage/make.profile | 1 +
.../demeter/gnome-v3/portage/package.use/bindist | 2 +
.../gnome-v3/portage/package.use/dist-kernel | 1 +
.../demeter/gnome-v3/portage/package.use/fixed | 6 +++
.../demeter/gnome-v3/portage/package.use/multilib | 27 ++++++++++++
.../demeter/gnome-v3/portage/package.use/queued | 1 +
.../demeter/gnome-v3/portage/package.use/xfce4 | 1 +
builders/demeter/gnome-v3/portage/package.use/zlib | 1 +
builders/demeter/gnome-v3/run-update | 10 +++++
builders/demeter/gnome-v3/world | 34 +++++++++++++++
builders/demeter/kde-v3/portage/make.conf | 35 +++++++++++++++
builders/demeter/kde-v3/portage/make.profile | 1 +
.../demeter/kde-v3/portage/package.use/bindist | 2 +
.../demeter/kde-v3/portage/package.use/dist-kernel | 1 +
builders/demeter/kde-v3/portage/package.use/ffmpeg | 1 +
builders/demeter/kde-v3/portage/package.use/fixed | 6 +++
builders/demeter/kde-v3/portage/package.use/queued | 3 ++
builders/demeter/kde-v3/run-update | 12 ++++++
builders/demeter/kde-v3/world | 50 ++++++++++++++++++++++
builders/demeter/server-v3/portage/make.conf | 35 +++++++++++++++
builders/demeter/server-v3/portage/make.profile | 1 +
.../server-v3/portage/package.use/dist-kernel | 1 +
builders/demeter/server-v3/run-update | 10 +++++
builders/demeter/server-v3/world | 13 ++++++
26 files changed, 298 insertions(+), 5 deletions(-)
diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index a3b0b33..1b595dc 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -9,9 +9,9 @@ LOCKFILE="/root/.tmp-binhost-${_BINHOST_NAME}-lock"
[email protected]
[email protected]
-NSPAWN_NAMES="binhost-amd64-x86-64 binhost-amd64-x86-64-gnome
binhost-amd64-x86-64-server"
+NSPAWN_NAMES="binhost-amd64-x86-64-kde binhost-amd64-x86-64-gnome
binhost-amd64-x86-64-server binhost-amd64-x86-64-v3-kde
binhost-amd64-x86-64-v3-gnome binhost-amd64-x86-64-v3-server"
-MAX_HARMLESS=150
+MAX_HARMLESS=200
UPLOAD_USER=amd64
UPLOAD_KEY=/root/.ssh/id_rsa
@@ -86,9 +86,11 @@ touch ${LOCKFILE} || exit 112
verify_dnssec
+echo Starting run at $(date -u) > ${TMPFILE}
+echo Syncing host &>> ${TMPFILE}
-echo Starting run at $(date -u) > ${TMPFILE}
+emerge --sync -q &>> ${TMPFILE}
for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
@@ -96,11 +98,12 @@ for n in ${NSPAWN_NAMES} ; do
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
git pull -q &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
- systemd-nspawn -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ systemd-nspawn --bind /var/cache/distfiles --bind-ro
/var/db/repos/gentoo -M ${n} /root/bin/run-update &>> ${TMPFILE}
done
-upsync_binpackages /var/lib/machines/binhost-amd64-x86-64/var/cache/binpkgs
amd64/17.1/x86-64 &>> ${TMPFILE}
+upsync_binpackages
/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs amd64/17.1/x86-64
&>> ${TMPFILE}
+upsync_binpackages
/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs
amd64/17.1/x86-64-v3 &>> ${TMPFILE}
if [[ $(wc -l ${TMPFILE} | sed -e 's: .*$::g') -gt ${MAX_HARMLESS} ]] ; then
diff --git a/builders/demeter/gnome-v3/portage/make.conf
b/builders/demeter/gnome-v3/portage/make.conf
new file mode 100644
index 0000000..13d1542
--- /dev/null
+++ b/builders/demeter/gnome-v3/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 -march=x86-64-v3"
+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/demeter/gnome-v3/portage/make.profile
b/builders/demeter/gnome-v3/portage/make.profile
new file mode 120000
index 0000000..4ac921c
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/gnome/systemd
\ No newline at end of file
diff --git a/builders/demeter/gnome-v3/portage/package.use/bindist
b/builders/demeter/gnome-v3/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/demeter/gnome-v3/portage/package.use/dist-kernel
b/builders/demeter/gnome-v3/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/demeter/gnome-v3/portage/package.use/fixed
b/builders/demeter/gnome-v3/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/demeter/gnome-v3/portage/package.use/multilib
b/builders/demeter/gnome-v3/portage/package.use/multilib
new file mode 100644
index 0000000..9537596
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/multilib
@@ -0,0 +1,27 @@
+dev-libs/icu abi_x86_32
+dev-libs/libclc abi_x86_32
+dev-libs/libffi abi_x86_32
+dev-libs/libxml2 abi_x86_32
+dev-ml/llvm-ocaml abi_x86_32
+dev-python/clang-python abi_x86_32
+dev-python/lit abi_x86_32
+dev-util/lldb abi_x86_32
+sys-devel/clang abi_x86_32
+sys-devel/clang-common abi_x86_32
+sys-devel/clang-runtime abi_x86_32
+sys-devel/clang-toolchain-symlinks abi_x86_32
+sys-devel/lld abi_x86_32
+sys-devel/lld-toolchain-symlinks abi_x86_32
+sys-devel/llvm abi_x86_32
+sys-devel/llvm-common abi_x86_32
+sys-devel/llvm-toolchain-symlinks abi_x86_32
+sys-devel/llvmgold abi_x86_32
+sys-libs/compiler-rt abi_x86_32
+sys-libs/compiler-rt-sanitizers abi_x86_32
+sys-libs/gpm abi_x86_32
+sys-libs/libcxx abi_x86_32
+sys-libs/libcxxabi abi_x86_32
+sys-libs/libomp abi_x86_32
+sys-libs/llvm-libunwind abi_x86_32
+sys-libs/ncurses abi_x86_32 -gpm
+sys-libs/zlib abi_x86_32
diff --git a/builders/demeter/gnome-v3/portage/package.use/queued
b/builders/demeter/gnome-v3/portage/package.use/queued
new file mode 100644
index 0000000..49491b2
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/queued
@@ -0,0 +1 @@
+media-libs/libvpx postproc
diff --git a/builders/demeter/gnome-v3/portage/package.use/xfce4
b/builders/demeter/gnome-v3/portage/package.use/xfce4
new file mode 100644
index 0000000..47dd0b9
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/xfce4
@@ -0,0 +1 @@
+dev-libs/libdbusmenu gtk3
diff --git a/builders/demeter/gnome-v3/portage/package.use/zlib
b/builders/demeter/gnome-v3/portage/package.use/zlib
new file mode 100644
index 0000000..b934da8
--- /dev/null
+++ b/builders/demeter/gnome-v3/portage/package.use/zlib
@@ -0,0 +1 @@
+sys-libs/zlib minizip
diff --git a/builders/demeter/gnome-v3/run-update
b/builders/demeter/gnome-v3/run-update
new file mode 100755
index 0000000..c9c4434
--- /dev/null
+++ b/builders/demeter/gnome-v3/run-update
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# if one thing fails, abort entirely
+set -e
+
+emerge --sync -q
+
+emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y
--rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
+
+emerge --depclean --quiet-unmerge-warn
diff --git a/builders/demeter/gnome-v3/world b/builders/demeter/gnome-v3/world
new file mode 100644
index 0000000..3c6854b
--- /dev/null
+++ b/builders/demeter/gnome-v3/world
@@ -0,0 +1,34 @@
+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-lang/mono
+dev-tex/latex-beamer
+gnome-base/gnome
+gnome-base/gnome-extra-apps
+lxqt-base/lxqt-meta
+mate-base/mate
+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
+xfce-base/xfce4-meta
diff --git a/builders/demeter/kde-v3/portage/make.conf
b/builders/demeter/kde-v3/portage/make.conf
new file mode 100644
index 0000000..13d1542
--- /dev/null
+++ b/builders/demeter/kde-v3/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 -march=x86-64-v3"
+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/demeter/kde-v3/portage/make.profile
b/builders/demeter/kde-v3/portage/make.profile
new file mode 120000
index 0000000..4f9702d
--- /dev/null
+++ b/builders/demeter/kde-v3/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/plasma/systemd
\ No newline at end of file
diff --git a/builders/demeter/kde-v3/portage/package.use/bindist
b/builders/demeter/kde-v3/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/demeter/kde-v3/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/demeter/kde-v3/portage/package.use/dist-kernel
b/builders/demeter/kde-v3/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/demeter/kde-v3/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/demeter/kde-v3/portage/package.use/ffmpeg
b/builders/demeter/kde-v3/portage/package.use/ffmpeg
new file mode 100644
index 0000000..aad80a4
--- /dev/null
+++ b/builders/demeter/kde-v3/portage/package.use/ffmpeg
@@ -0,0 +1 @@
+media-video/ffmpeg libass
diff --git a/builders/demeter/kde-v3/portage/package.use/fixed
b/builders/demeter/kde-v3/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/demeter/kde-v3/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/demeter/kde-v3/portage/package.use/queued
b/builders/demeter/kde-v3/portage/package.use/queued
new file mode 100644
index 0000000..f61935d
--- /dev/null
+++ b/builders/demeter/kde-v3/portage/package.use/queued
@@ -0,0 +1,3 @@
+media-libs/libvpx postproc
+dev-qt/qtpositioning geoclue
+dev-python/pillow webp
diff --git a/builders/demeter/kde-v3/run-update
b/builders/demeter/kde-v3/run-update
new file mode 100755
index 0000000..7756f64
--- /dev/null
+++ b/builders/demeter/kde-v3/run-update
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# if one thing fails, abort entirely
+set -e
+
+emerge --sync -q
+
+emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y
--rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
+
+emerge --depclean --quiet-unmerge-warn
+
+eclean-pkg -C
diff --git a/builders/demeter/kde-v3/world b/builders/demeter/kde-v3/world
new file mode 100644
index 0000000..c8f7826
--- /dev/null
+++ b/builders/demeter/kde-v3/world
@@ -0,0 +1,50 @@
+app-admin/keepassxc
+app-containers/docker
+app-containers/earthly
+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/calibre
+app-text/pdftk
+app-text/xournalpp
+dev-lang/mono
+dev-tex/latex-beamer
+dev-util/kdevelop
+kde-apps/kde-apps-meta
+kde-apps/kdepim-meta
+kde-plasma/plasma-meta
+lxqt-base/lxqt-meta
+mate-base/mate
+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-auth/AusweisApp2
+sys-devel/clang
+sys-devel/gdb
+www-client/firefox
+www-client/qutebrowser
+www-servers/apache
diff --git a/builders/demeter/server-v3/portage/make.conf
b/builders/demeter/server-v3/portage/make.conf
new file mode 100644
index 0000000..13d1542
--- /dev/null
+++ b/builders/demeter/server-v3/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 -march=x86-64-v3"
+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/demeter/server-v3/portage/make.profile
b/builders/demeter/server-v3/portage/make.profile
new file mode 120000
index 0000000..228f629
--- /dev/null
+++ b/builders/demeter/server-v3/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/no-multilib
\ No newline at end of file
diff --git a/builders/demeter/server-v3/portage/package.use/dist-kernel
b/builders/demeter/server-v3/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/demeter/server-v3/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/demeter/server-v3/run-update
b/builders/demeter/server-v3/run-update
new file mode 100755
index 0000000..c9c4434
--- /dev/null
+++ b/builders/demeter/server-v3/run-update
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# if one thing fails, abort entirely
+set -e
+
+emerge --sync -q
+
+emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y
--rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
+
+emerge --depclean --quiet-unmerge-warn
diff --git a/builders/demeter/server-v3/world b/builders/demeter/server-v3/world
new file mode 100644
index 0000000..1c2d3ae
--- /dev/null
+++ b/builders/demeter/server-v3/world
@@ -0,0 +1,13 @@
+app-admin/rsyslog
+app-arch/bzip3
+app-containers/docker
+app-editors/nano
+app-portage/gentoolkit
+net-misc/chrony
+net-misc/dhcpcd
+net-vpn/openvpn
+sci-libs/armadillo
+sci-mathematics/z3
+sys-apps/portage
+sys-devel/clang
+www-servers/apache
