From 216f5c1aa424e83ad507ac8bd91f00d4c379ed2f Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 3 Feb 2026 12:55:15 -0500 Subject: [PATCH 1/7] profile: mask old ffmpeg to help dep resolver --- profiles/pentoo/base/package.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index 4991daca8..00c74ad7c 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -69,3 +69,6 @@ sci-libs/mkl # force llvm/clang upgrade Date: Tue, 3 Feb 2026 13:19:55 -0500 Subject: [PATCH 2/7] pentoo-desktop: drop tigervnc for now, add vnc support to remmina --- ...esktop-2025.3-r3.ebuild => pentoo-desktop-2026.0.ebuild} | 6 ++---- profiles/pentoo/base/package.use/net-misc | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) rename pentoo/pentoo-desktop/{pentoo-desktop-2025.3-r3.ebuild => pentoo-desktop-2026.0.ebuild} (97%) diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2025.3-r3.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2026.0.ebuild similarity index 97% rename from pentoo/pentoo-desktop/pentoo-desktop-2025.3-r3.ebuild rename to pentoo/pentoo-desktop/pentoo-desktop-2026.0.ebuild index bd9365fbd..455b72ed7 100644 --- a/pentoo/pentoo-desktop/pentoo-desktop-2025.3-r3.ebuild +++ b/pentoo/pentoo-desktop/pentoo-desktop-2026.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,9 +41,7 @@ PDEPEND="X? ( pulseaudio? ( || ( kde? ( media-sound/pavucontrol-qt ) media-sound/pavucontrol ) ) - vnc? ( - || ( kde? ( kde-apps/krdc ) net-misc/tigervnc ) - ) + vnc? ( kde? ( kde-apps/krdc ) ) firefox? ( pentoo-in-a-container? ( || ( www-client/firefox-bin www-client/firefox ) diff --git a/profiles/pentoo/base/package.use/net-misc b/profiles/pentoo/base/package.use/net-misc index 5ea6048a7..d05ff4026 100644 --- a/profiles/pentoo/base/package.use/net-misc +++ b/profiles/pentoo/base/package.use/net-misc @@ -3,7 +3,7 @@ net-misc/modemmanager mbim net-misc/networkmanager connection-sharing nftables net-misc/ntpsec rclock_gpsd rclock_generic rclock_shm rclock_pps rclock_nmea rclock_modem net-misc/openssh ldns security-key xmss -ldap -net-misc/remmina rdp spice ssh vnc zeroconf +net-misc/remmina gvnc rdp spice ssh vnc zeroconf net-misc/spice-gtk gtk3 python usbredir net-vpn/openvpn -static net-vpn/tor nat-pmp tor-hardening transparent-proxy upnp threads From 7599b27938a004f0411402f0f6394ac85c17ed34 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 3 Feb 2026 20:53:39 -0500 Subject: [PATCH 3/7] workflows: try to build without binpkgs if binpkgs fail --- scripts/qa/test-build | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/qa/test-build b/scripts/qa/test-build index 8cc668601..6236673c3 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -14,7 +14,7 @@ dep_build() { emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --onlydeps "${1}" } -build() { +binpkg_build() { emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" } @@ -27,11 +27,16 @@ for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/mast printf '%s appears to be unmasked, building deps\n' "${i}" if dep_build "${test_ebuild}"; then printf '%s deps have built, build testing\n' "${i}" - if build "${test_ebuild}"; then - printf '%s build SUCCESS\n' "${i}" + if binpkg_build "${test_ebuild}"; then + printf '%s binpkg build SUCCESS\n' "${i}" else - printf '%s build FAILED\n' "${i}" - FAILED="1" + printf '%s binpkg build FAILED\n' "${i}" + if build "${test_ebuild}"; then + printf '%s build without binpkgs SUCCESS\n' "${i}" + else + printf '%s build without binpkgs also FAILED\n' "${i}" + FAILED="1" + fi fi else printf 'WARNING WARNING WARNING\n' From ebababa5e1496a86a007ee1879cf21ea3b0a3a24 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 3 Feb 2026 20:56:51 -0500 Subject: [PATCH 4/7] revamp workflows to be more tolerant --- .github/workflows/pentoo-binpkgs.yaml | 28 ++++++++++++++++++++++++ .github/workflows/pentoo-visibility.yaml | 2 +- scripts/qa/Dockerfile.binpkg | 22 +++++++++++++++++++ scripts/qa/Dockerfile.visibility | 2 +- 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/pentoo-binpkgs.yaml create mode 100644 scripts/qa/Dockerfile.binpkg diff --git a/.github/workflows/pentoo-binpkgs.yaml b/.github/workflows/pentoo-binpkgs.yaml new file mode 100644 index 000000000..ae2536d14 --- /dev/null +++ b/.github/workflows/pentoo-binpkgs.yaml @@ -0,0 +1,28 @@ +name: Pentoo Binpkg Check + +on: + schedule: + - cron: "6 * * * *" + pull_request: + branches: + - master + +jobs: + pentoo-visibility-check: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v5 + with: + fetch-depth: 0 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: List added files + run: git diff-tree --no-commit-id --name-only -r ${{ github.sha }} + - + name: Binpkg Check + run: | + sudo docker build --progress=plain . -f scripts/qa/Dockerfile.binpkg diff --git a/.github/workflows/pentoo-visibility.yaml b/.github/workflows/pentoo-visibility.yaml index 4cfc10e28..fc79d0c50 100644 --- a/.github/workflows/pentoo-visibility.yaml +++ b/.github/workflows/pentoo-visibility.yaml @@ -2,7 +2,7 @@ name: Pentoo Visibility Check on: schedule: - - cron: "3 * * * *" + - cron: "6 * * * *" pull_request: branches: - master diff --git a/scripts/qa/Dockerfile.binpkg b/scripts/qa/Dockerfile.binpkg new file mode 100644 index 000000000..6ee4614e6 --- /dev/null +++ b/scripts/qa/Dockerfile.binpkg @@ -0,0 +1,22 @@ +FROM pentoolinux/pentoo-core + +# Setup repos +WORKDIR /var/db/repos/ +# setup gentoo repo +RUN git clone https://github.com/gentoo/gentoo.git --depth 1 +# setup pentoo repo +#RUN git clone https://github.com/pentoo/pentoo-overlay.git pentoo --depth 1 +# Use the github checkout for pentoo, that's what we are testing +COPY . pentoo + +#Regen doubles the time it takes for the action to run +#Revisit if this is worth running when we have >2 emerge calls +#RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs=$(nproc) --quiet + +WORKDIR /home + +# disable minimal (pentoo-core is default minimal) +RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf + +#test install pentoo/pentoo +RUN time FEATURES="getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility index 03b069093..7833c4443 100644 --- a/scripts/qa/Dockerfile.visibility +++ b/scripts/qa/Dockerfile.visibility @@ -19,4 +19,4 @@ WORKDIR /home RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf #test install pentoo/pentoo -RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend +RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend From 488a33ea59ea74de015d68c61be8a1e1340eb0d3 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 3 Feb 2026 21:36:47 -0500 Subject: [PATCH 5/7] workflow: less binpkgs --- scripts/qa/Dockerfile.visibility | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility index 7833c4443..29766e08f 100644 --- a/scripts/qa/Dockerfile.visibility +++ b/scripts/qa/Dockerfile.visibility @@ -19,4 +19,4 @@ WORKDIR /home RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf #test install pentoo/pentoo -RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend +RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=n --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend From 8a252606b2437c5bd7ffe3ba8ee6cabf9a964ea4 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 3 Feb 2026 21:38:27 -0500 Subject: [PATCH 6/7] workflow: fix name --- .github/workflows/pentoo-binpkgs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pentoo-binpkgs.yaml b/.github/workflows/pentoo-binpkgs.yaml index ae2536d14..32d1ef9ee 100644 --- a/.github/workflows/pentoo-binpkgs.yaml +++ b/.github/workflows/pentoo-binpkgs.yaml @@ -8,7 +8,7 @@ on: - master jobs: - pentoo-visibility-check: + pentoo-binpkg-check: runs-on: ubuntu-latest steps: - From e3d476f2880c66652c9429dd12a4c0af6d397445 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 3 Feb 2026 21:40:52 -0500 Subject: [PATCH 7/7] workflow: fix test-build --- scripts/qa/test-build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/qa/test-build b/scripts/qa/test-build index 6236673c3..fc28703d4 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -18,6 +18,10 @@ binpkg_build() { emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" } +build() { + FEATURES="${FEATURES} -getbinpkg" emerge --getbinpkg=n --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" +} + for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do if [ "${i%.ebuild}" != "${i}" ]; then test_ebuild="$(printf '%s' "${i%.ebuild}" | awk -F'/' '{print "="$1"/"$3}')"