Skip to content

Commit 43cb455

Browse files
authored
Merge pull request #3040 from pentoo/updates20260923
profile: update scons to fix gpsd
2 parents b34bc52 + 1d74ce7 commit 43cb455

8 files changed

Lines changed: 15 additions & 12 deletions

File tree

pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild renamed to pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PDEPEND="X? (
2020
amd64? (
2121
sys-firmware/sof-firmware
2222
chrome? (
23-
|| ( www-client/google-chrome www-client/chromium:stable www-client/google-chrome-beta www-client/google-chrome-unstable )
23+
|| ( www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable )
2424
)
2525
)
2626

pentoo/zero-system/zero-system-2026.2-r4.ebuild renamed to pentoo/zero-system/zero-system-2026.2-r5.ebuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ RDEPEND="
5454
x11-misc/slim
5555
x11-misc/xdotool
5656
xfce-extra/xfce4-genmon-plugin
57-
amd64? ( www-client/chromium:stable )
5857
arm? ( www-client/firefox )
5958
!arm? ( www-client/firefox-bin
6059
www-client/google-chrome

‎profiles/pentoo/base/make.defaults‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ BRANDING_OS_HOME_URL='https://pentoo.org/'
8484
BRANDING_OS_SUPPORT_URL='https://pentoo.org/'
8585
BRANDING_OS_BUG_REPORT_URL='https://github.com/pentoo/pentoo-overlay/issues'
8686
BRANDING_OS_PRETTY_NAME='Pentoo Linux'
87+
88+
ACCEPT_LICENSE="${ACCEPT_LICENSE} google-chrome"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#https://bugs.gentoo.org/982332
2+
#https://bugs.gentoo.org/980766
3+
~dev-build/scons-4.11.1 amd64 arm arm64

‎profiles/pentoo/base/package.mask‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ sci-libs/mkl
7575

7676
#force sticky upgrade
7777
<sys-apps/shadow-4.19.3
78+
79+
#https://bugs.gentoo.org/982332
80+
=dev-build/scons-4.11.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../base/package.keywords/dev-build

‎scripts/qa/Dockerfile.visibility‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM pentoolinux/pentoo-core
1+
FROM pentoolinux/pentoo-core-ci
22

33
# Setup repos
44
WORKDIR /var/db/repos/
@@ -15,15 +15,6 @@ COPY . pentoo
1515

1616
WORKDIR /home
1717

18-
# disable minimal (pentoo-core is default minimal)
19-
RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf
20-
21-
RUN goornogo="$(portageq match / 'dev-lang/go')"
22-
RUN if [ -z "${goornogo}" ]; then \
23-
emerge -1 -kb dev-lang/go-bootstrap; \
24-
emerge -1 -kb dev-lang/go; \
25-
fi
26-
2718
# Check consistency of all metadata in the repo
2819
RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs="$(nproc)" --quiet
2920
# test install pentoo/pentoo

‎scripts/qa/test-build‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -x
23
WARNED='0'
34
FAILED='0'
45
FEATURES='-ipc-sandbox -network-sandbox -pid-sandbox'
@@ -32,6 +33,9 @@ print_build_log() {
3233
fi
3334
}
3435

36+
# Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage
37+
#emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose @world
38+
3539
for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do
3640
if [ "${i%.ebuild}" != "${i}" ]; then
3741
test_ebuild="$(printf '%s' "${i%.ebuild}" | awk -F'/' '{print "="$1"/"$3}')"

0 commit comments

Comments
 (0)