From d5d6eb779e1c86832dd8f645c3a8471d0d15ff3d Mon Sep 17 00:00:00 2001 From: Carlos Alberto Lopez Perez Date: Thu, 25 Jul 2024 12:27:21 +0100 Subject: [PATCH] webkitdevci: add polkit feature and tune packages installed. - add sysprof: useful for performance debugging. It needs polkit to build sysprofd which is needed to make anything useful with it. - weston: enable rdp support, useful for remote debugging - simplify the list of gdk-pixbuf: only installing the main package is enough, the others are just rdepends aliases that may cause conflicts in the last step of the image build. Signed-off-by: Carlos Alberto Lopez Perez --- conf/distro/webkitdevci.conf | 5 +++-- recipes-browser/images/webkit-dev-ci-tools.bb | 4 ++++ .../packagegroups/packagegroup-wpewebkit-depends.bb | 5 +---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/conf/distro/webkitdevci.conf b/conf/distro/webkitdevci.conf index cd2ed6ae..1f952c23 100644 --- a/conf/distro/webkitdevci.conf +++ b/conf/distro/webkitdevci.conf @@ -26,7 +26,7 @@ DISTRO_VERSION:append = "_${WEBKIT_CROSS_VERSION}" DISTROOVERRIDES:append = " poky:linuxstdbase" # Distro features -DISTRO_FEATURES:append = " opengl egl pam systemd usrmerge" +DISTRO_FEATURES:append = " opengl egl pam systemd usrmerge polkit" DISTRO_FEATURES:remove = "ptest" DISTRO_FEATURES_NATIVESDK:append = " wayland" @@ -40,7 +40,8 @@ PACKAGECONFIG:append:pn-gdb = " tui" PACKAGECONFIG:append:pn-gdb-cross = " tui" PACKAGECONFIG:append:pn-gdb-cross-canadian = " tui" -# Don't blank the screen on weston +# Don't blank the screen on weston, and build the rdp backend +PACKAGECONFIG:append:pn-weston = " rdp" PACKAGECONFIG:append:pn-weston-init = " no-idle-timeout" # Enable php plugins for apache (for tests) PACKAGECONFIG:append:pn-php = " apache2" diff --git a/recipes-browser/images/webkit-dev-ci-tools.bb b/recipes-browser/images/webkit-dev-ci-tools.bb index ffa807e4..199fbe9a 100644 --- a/recipes-browser/images/webkit-dev-ci-tools.bb +++ b/recipes-browser/images/webkit-dev-ci-tools.bb @@ -84,6 +84,7 @@ IMAGE_INSTALL:append = " \ perf \ pv \ screen \ + sysprof \ smem \ systemd-analyze \ unifdef \ @@ -91,6 +92,9 @@ IMAGE_INSTALL:append = " \ wayland-tools \ " +# vcgencmd and related tools for the RPi (works also with opensource stack) +IMAGE_INSTALL:append:rpi = " userland" + SDK_NATIVE_TOOLS = " \ nativesdk-bison \ nativesdk-ca-certificates \ diff --git a/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb b/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb index 9459f4c6..ea013120 100644 --- a/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb +++ b/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb @@ -170,10 +170,7 @@ RDEPENDS:packagegroup-wpewebkit-depends-desktop = "\ libxtst \ libx11-locale \ xorg-minimal-fonts \ - gdk-pixbuf-loader-ico \ - gdk-pixbuf-loader-bmp \ - gdk-pixbuf-loader-ani \ - gdk-pixbuf-xlib \ + gdk-pixbuf \ liberation-fonts \ atk \ at-spi2-atk \