From d1fc03deea267f5237aa2adee8a23cedf9595783 Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Tue, 4 Jun 2024 21:06:11 +0200 Subject: Clean up arm64 17.0 builders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- builders/jiji/binhost-update | 3 +- builders/jiji/gnome/portage/make.conf | 36 ---------------------- 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 | 2 -- builders/jiji/gnome/portage/package.use/zlib | 1 - builders/jiji/gnome/run-update | 10 ------ builders/jiji/gnome/world | 19 ------------ builders/jiji/kde/portage/make.conf | 36 ---------------------- 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 | 3 -- builders/jiji/kde/run-update | 10 ------ builders/jiji/kde/world | 21 ------------- builders/jiji/server/portage/make.conf | 36 ---------------------- builders/jiji/server/portage/make.profile | 1 - .../jiji/server/portage/package.use/dist-kernel | 1 - builders/jiji/server/portage/package.use/go | 1 - builders/jiji/server/run-update | 10 ------ builders/jiji/server/world | 9 ------ 25 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 builders/jiji/gnome/portage/make.conf delete mode 120000 builders/jiji/gnome/portage/make.profile delete mode 100644 builders/jiji/gnome/portage/package.use/bindist delete mode 100644 builders/jiji/gnome/portage/package.use/dist-kernel delete mode 100644 builders/jiji/gnome/portage/package.use/fixed delete mode 100644 builders/jiji/gnome/portage/package.use/queued delete mode 100644 builders/jiji/gnome/portage/package.use/zlib delete mode 100755 builders/jiji/gnome/run-update delete mode 100644 builders/jiji/gnome/world delete mode 100644 builders/jiji/kde/portage/make.conf delete mode 120000 builders/jiji/kde/portage/make.profile delete mode 100644 builders/jiji/kde/portage/package.use/bindist delete mode 100644 builders/jiji/kde/portage/package.use/dist-kernel delete mode 100644 builders/jiji/kde/portage/package.use/ffmpeg delete mode 100644 builders/jiji/kde/portage/package.use/fixed delete mode 100644 builders/jiji/kde/portage/package.use/queued delete mode 100755 builders/jiji/kde/run-update delete mode 100644 builders/jiji/kde/world delete mode 100644 builders/jiji/server/portage/make.conf delete mode 120000 builders/jiji/server/portage/make.profile delete mode 100644 builders/jiji/server/portage/package.use/dist-kernel delete mode 100644 builders/jiji/server/portage/package.use/go delete mode 100755 builders/jiji/server/run-update delete mode 100644 builders/jiji/server/world diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update index 531907e..49210eb 100755 --- a/builders/jiji/binhost-update +++ b/builders/jiji/binhost-update @@ -1,6 +1,6 @@ #!/bin/bash -BINHOST_NAME=arm64/xx.x/arm64 +BINHOST_NAME=arm64/23.0/arm64 _BINHOST_NAME=$(echo ${BINHOST_NAME}|sed -e 's:/:_:g') TMPFILE="/root/.tmp-binhost-${_BINHOST_NAME}-update-$(date +%s)" @@ -106,7 +106,6 @@ for n in ${NSPAWN_NAMES} ; do let "anyfail+=$?" done -upsync_binpackages /var/lib/machines/binhost-arm64-kde/var/cache/binpkgs arm64/17.0/arm64 &>> ${TMPFILE} upsync_binpackages /var/lib/machines/binhost-arm64-kde-23/var/cache/binpkgs arm64/23.0/arm64 &>> ${TMPFILE} if [[ ${anyfail} -gt 0 ]] ; then diff --git a/builders/jiji/gnome/portage/make.conf b/builders/jiji/gnome/portage/make.conf deleted file mode 100644 index 3f97c6b..0000000 --- a/builders/jiji/gnome/portage/make.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 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="-j80 --load 160.0" - -EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" - -FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox" - -BINPKG_FORMAT="gpkg" -BINPKG_COMPRESS="xz" - -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 deleted file mode 120000 index fc2c0f6..0000000 --- a/builders/jiji/gnome/portage/make.profile +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 100644 index b75a197..0000000 --- a/builders/jiji/gnome/portage/package.use/bindist +++ /dev/null @@ -1,2 +0,0 @@ - -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 deleted file mode 100644 index 7e6ada4..0000000 --- a/builders/jiji/gnome/portage/package.use/dist-kernel +++ /dev/null @@ -1 +0,0 @@ -*/* dist-kernel diff --git a/builders/jiji/gnome/portage/package.use/fixed b/builders/jiji/gnome/portage/package.use/fixed deleted file mode 100644 index 9574ec7..0000000 --- a/builders/jiji/gnome/portage/package.use/fixed +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index 418ed2d..0000000 --- a/builders/jiji/gnome/portage/package.use/queued +++ /dev/null @@ -1,2 +0,0 @@ -media-libs/libvpx postproc -dev-libs/libpcre2 pcre32 diff --git a/builders/jiji/gnome/portage/package.use/zlib b/builders/jiji/gnome/portage/package.use/zlib deleted file mode 100644 index b934da8..0000000 --- a/builders/jiji/gnome/portage/package.use/zlib +++ /dev/null @@ -1 +0,0 @@ -sys-libs/zlib minizip diff --git a/builders/jiji/gnome/run-update b/builders/jiji/gnome/run-update deleted file mode 100755 index fff9934..0000000 --- a/builders/jiji/gnome/run-update +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# if one thing fails, abort entirely -set -e - -emerge -uDNkq --changed-deps --backtrack=100 --keep-going world - -emerge --depclean --quiet-unmerge-warn - -eclean-pkg -C diff --git a/builders/jiji/gnome/world b/builders/jiji/gnome/world deleted file mode 100644 index 129ff1e..0000000 --- a/builders/jiji/gnome/world +++ /dev/null @@ -1,19 +0,0 @@ -app-editors/emacs -app-editors/nano -app-editors/vim -app-office/libreoffice -app-portage/eix -app-portage/gentoolkit -dev-tex/latex-beamer -gnome-base/gnome -gnome-base/gnome-extra-apps -media-gfx/gimp -net-irc/quassel -net-misc/chrony -net-misc/dhcpcd -net-vpn/openvpn -sci-visualization/gnuplot -sys-apps/portage -sys-devel/clang -dev-debug/gdb -www-client/firefox diff --git a/builders/jiji/kde/portage/make.conf b/builders/jiji/kde/portage/make.conf deleted file mode 100644 index 3f97c6b..0000000 --- a/builders/jiji/kde/portage/make.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 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="-j80 --load 160.0" - -EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" - -FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox" - -BINPKG_FORMAT="gpkg" -BINPKG_COMPRESS="xz" - -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 deleted file mode 120000 index 7af4278..0000000 --- a/builders/jiji/kde/portage/make.profile +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 100644 index b75a197..0000000 --- a/builders/jiji/kde/portage/package.use/bindist +++ /dev/null @@ -1,2 +0,0 @@ - -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 deleted file mode 100644 index 7e6ada4..0000000 --- a/builders/jiji/kde/portage/package.use/dist-kernel +++ /dev/null @@ -1 +0,0 @@ -*/* dist-kernel diff --git a/builders/jiji/kde/portage/package.use/ffmpeg b/builders/jiji/kde/portage/package.use/ffmpeg deleted file mode 100644 index aad80a4..0000000 --- a/builders/jiji/kde/portage/package.use/ffmpeg +++ /dev/null @@ -1 +0,0 @@ -media-video/ffmpeg libass diff --git a/builders/jiji/kde/portage/package.use/fixed b/builders/jiji/kde/portage/package.use/fixed deleted file mode 100644 index 9574ec7..0000000 --- a/builders/jiji/kde/portage/package.use/fixed +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index 5b32ab5..0000000 --- a/builders/jiji/kde/portage/package.use/queued +++ /dev/null @@ -1,3 +0,0 @@ -media-libs/libvpx postproc -dev-qt/qtpositioning geoclue -dev-libs/libpcre2 pcre32 diff --git a/builders/jiji/kde/run-update b/builders/jiji/kde/run-update deleted file mode 100755 index fff9934..0000000 --- a/builders/jiji/kde/run-update +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# if one thing fails, abort entirely -set -e - -emerge -uDNkq --changed-deps --backtrack=100 --keep-going world - -emerge --depclean --quiet-unmerge-warn - -eclean-pkg -C diff --git a/builders/jiji/kde/world b/builders/jiji/kde/world deleted file mode 100644 index 5e6a2ec..0000000 --- a/builders/jiji/kde/world +++ /dev/null @@ -1,21 +0,0 @@ -app-editors/emacs -app-editors/nano -app-office/libreoffice -app-portage/eix -app-portage/gentoolkit -dev-tex/latex-beamer -dev-util/kdevelop -kde-apps/kde-apps-meta -kde-apps/kdepim-meta -kde-plasma/plasma-meta -media-gfx/gimp -net-irc/quassel -net-misc/chrony -net-misc/dhcpcd -net-vpn/openvpn -sci-visualization/gnuplot -sys-apps/portage -sys-devel/clang -dev-debug/gdb -www-client/firefox -www-servers/apache diff --git a/builders/jiji/server/portage/make.conf b/builders/jiji/server/portage/make.conf deleted file mode 100644 index 3f97c6b..0000000 --- a/builders/jiji/server/portage/make.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 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="-j80 --load 160.0" - -EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" - -FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox" - -BINPKG_FORMAT="gpkg" -BINPKG_COMPRESS="xz" - -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 deleted file mode 120000 index b26bce1..0000000 --- a/builders/jiji/server/portage/make.profile +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 100644 index 7e6ada4..0000000 --- a/builders/jiji/server/portage/package.use/dist-kernel +++ /dev/null @@ -1 +0,0 @@ -*/* dist-kernel diff --git a/builders/jiji/server/portage/package.use/go b/builders/jiji/server/portage/package.use/go deleted file mode 100644 index 2b6a6d9..0000000 --- a/builders/jiji/server/portage/package.use/go +++ /dev/null @@ -1 +0,0 @@ -sys-devel/binutils gold diff --git a/builders/jiji/server/run-update b/builders/jiji/server/run-update deleted file mode 100755 index fff9934..0000000 --- a/builders/jiji/server/run-update +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# if one thing fails, abort entirely -set -e - -emerge -uDNkq --changed-deps --backtrack=100 --keep-going world - -emerge --depclean --quiet-unmerge-warn - -eclean-pkg -C diff --git a/builders/jiji/server/world b/builders/jiji/server/world deleted file mode 100644 index 3555899..0000000 --- a/builders/jiji/server/world +++ /dev/null @@ -1,9 +0,0 @@ -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 -- cgit v1.2.3-65-gdbad