Skip to content

webkit-dev-ci-tools image: ship netdata but with systemd unit disabled #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clopez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

webkit-dev-ci-tools image: ship netdata but with systemd unit disabled #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions classes/systemd-auto-enable-policy.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Easily allow to disable specific systemd services at the distro level conf
python __anonymous() {
if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
packages_to_disable = d.getVar('SYSTEMD_AUTOSTART_DISABLE') or ''
pn = d.getVar('PN')
if pn in packages_to_disable.split():
d.setVar('SYSTEMD_AUTO_ENABLE:%s' % pn, 'disable')
}
6 changes: 6 additions & 0 deletions conf/distro/webkitdevci.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,11 @@ PACKAGECONFIG:append:pn-php = " apache2"
# Disable mysql support as we don't need to build mysql/mariadb
PACKAGECONFIG:remove:pn-php = "mysql"

# Disable the following systemd services by default
# - Netdata: is only needed on the RPi4 bots and is manually enabled there (via deploy-webkit-buildbot-ews).
# - Apache2: the service is not needed for the tests, the layout test runner takes care of starting/stopping it.
INHERIT += "systemd-auto-enable-policy"
SYSTEMD_AUTOSTART_DISABLE = "netdata apache2"

# Whitelist license from some deps.
LICENSE_FLAGS_ACCEPTED:append = " commercial synaptics-killswitch"
3 changes: 2 additions & 1 deletion dynamic-layers/webserver/recipes-core/images/webkit-dev-ci-tools.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
IMAGE_INSTALL:append = " \
apache2 \
apache2-scripts \
"
netdata \
"