Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PDEPEND="X? (
amd64? (
sys-firmware/sof-firmware
chrome? (
|| ( www-client/google-chrome www-client/chromium:stable www-client/google-chrome-beta www-client/google-chrome-unstable )
|| ( www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable )
)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ RDEPEND="
x11-misc/slim
x11-misc/xdotool
xfce-extra/xfce4-genmon-plugin
amd64? ( www-client/chromium:stable )
arm? ( www-client/firefox )
!arm? ( www-client/firefox-bin
www-client/google-chrome
Expand Down
2 changes: 2 additions & 0 deletions profiles/pentoo/base/make.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,5 @@ BRANDING_OS_HOME_URL='https://pentoo.org/'
BRANDING_OS_SUPPORT_URL='https://pentoo.org/'
BRANDING_OS_BUG_REPORT_URL='https://github.com/pentoo/pentoo-overlay/issues'
BRANDING_OS_PRETTY_NAME='Pentoo Linux'

ACCEPT_LICENSE="${ACCEPT_LICENSE} google-chrome"
3 changes: 3 additions & 0 deletions profiles/pentoo/base/package.keywords/dev-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#https://bugs.gentoo.org/982332
#https://bugs.gentoo.org/980766
~dev-build/scons-4.11.1 amd64 arm arm64
3 changes: 3 additions & 0 deletions profiles/pentoo/base/package.mask
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ sci-libs/mkl

#force sticky upgrade
<sys-apps/shadow-4.19.3

#https://bugs.gentoo.org/982332
=dev-build/scons-4.11.0
1 change: 1 addition & 0 deletions profiles/pentoo/overlay/package.keywords/dev-build
11 changes: 1 addition & 10 deletions scripts/qa/Dockerfile.visibility
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pentoolinux/pentoo-core
FROM pentoolinux/pentoo-core-ci

# Setup repos
WORKDIR /var/db/repos/
Expand All @@ -15,15 +15,6 @@ COPY . pentoo

WORKDIR /home

# disable minimal (pentoo-core is default minimal)
RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf

RUN goornogo="$(portageq match / 'dev-lang/go')"
RUN if [ -z "${goornogo}" ]; then \
emerge -1 -kb dev-lang/go-bootstrap; \
emerge -1 -kb dev-lang/go; \
fi

# Check consistency of all metadata in the repo
RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs="$(nproc)" --quiet
# test install pentoo/pentoo
Expand Down
4 changes: 4 additions & 0 deletions scripts/qa/test-build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
set -x
WARNED='0'
FAILED='0'
FEATURES='-ipc-sandbox -network-sandbox -pid-sandbox'
Expand Down Expand Up @@ -32,6 +33,9 @@ print_build_log() {
fi
}

# Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage
#emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose @world

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}')"
Expand Down
Loading