core-image-weston: add sdk/ptest images
RFC PATCH 1/12 core-image-weston: add sdk/ptest images
This is the first step towards rebasing the AB matrix from sato to weston; the eventual goal is to keep sato only in core-image-sato image.
The broader rationale is that X11 is effectively deprecated technology at this point with only minimal maintenance; standalone X server will not be developed any further, and all attention currently is towards making it work well under Wayland.
I believe YP should be defaulting to Wayland and not X11.
--- meta/conf/distro/include/maintainers.inc | 3 +++ .../images/core-image-weston-ptest-all.bb | 21 +++++++++++++++++++ .../images/core-image-weston-ptest-fast.bb | 20 ++++++++++++++++++ .../images/core-image-weston-sdk.bb | 11 ++++++++++ 4 files changed, 55 insertions(+) create mode 100644 meta/recipes-graphics/images/core-image-weston-ptest-all.bb create mode 100644 meta/recipes-graphics/images/core-image-weston-ptest-fast.bb create mode 100644 meta/recipes-graphics/images/core-image-weston-sdk.bb
meta/conf/distro/include/maintainers.inc +3 -0
@@ -117,6 +117,9 @@ RECIPE_MAINTAINER_pn-core-image-testmaster-initramfs = "Richard Purdie <richard. RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <[email protected]>" +RECIPE_MAINTAINER_pn-core-image-weston-ptest-all = "Richard Purdie <[email protected]>" +RECIPE_MAINTAINER_pn-core-image-weston-ptest-fast = "Richard Purdie <[email protected]>" +RECIPE_MAINTAINER_pn-core-image-weston-sdk = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <[email protected]>"
meta/recipes-graphics/images/core-image-weston-ptest-all.bb new file +21 -0
@@ -0,0 +1,21 @@ +require core-image-weston-sdk.bb +require conf/distro/include/ptest-packagelists.inc + +DESCRIPTION += "Also includes ptest packages." + +# Include the full set of ptests +IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" + +# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add just 1100MB. +# strace-ptest in particular needs more than 500MB +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "1124288" + +# ptests need more memory than standard to avoid the OOM killer +# also lttng-tools needs /tmp that has at least 1G +QB_MEM = "-m 2048" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1"
meta/recipes-graphics/images/core-image-weston-ptest-fast.bb new file +20 -0
@@ -0,0 +1,20 @@ +require core-image-weston-sdk.bb +require conf/distro/include/ptest-packagelists.inc + +# Include only fast (< 30 sec) ptests +IMAGE_INSTALL += "${PTESTS_FAST}" + +DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." + +# This image is sufficiently large (~1.8GB) that it can't actually fit in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add just 1500MB. +# strace-ptest in particular needs more than 500MB +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "1524288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" + +# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places +PTEST_EXPECT_FAILURE = "1"
meta/recipes-graphics/images/core-image-weston-sdk.bb new file +11 -0
@@ -0,0 +1,11 @@ +require core-image-weston.bb + +DESCRIPTION = "Image with Weston support that includes everything within \ +core-image-weston plus meta-toolchain, development headers and libraries to \ +form a standalone SDK." + +IMAGE_FEATURES += "dev-pkgs tools-sdk \ + tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" + +IMAGE_INSTALL += "kernel-devsrc" +
Signature · 1 line
2.29.1
RFC PATCH 2/12 oeqa/buildperf: use weston image instead of sato
--- meta/lib/oeqa/buildperf/test_basic.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
meta/lib/oeqa/buildperf/test_basic.py +7 -7
@@ -11,10 +11,10 @@ from oeqa.buildperf import BuildPerfTestCase from oeqa.utils.commands import get_bb_var, get_bb_vars class Test1P1(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test1(self): - """Build core-image-sato""" + """Build core-image-weston""" self.rm_tmp() self.rm_sstate() self.rm_cache()
@@ -40,10 +40,10 @@ class Test1P2(BuildPerfTestCase): class Test1P3(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test13(self): - """Build core-image-sato with rm_work enabled""" + """Build core-image-weston with rm_work enabled""" postfile = os.path.join(self.tmp_dir, 'postfile.conf') with open(postfile, 'w') as fobj: fobj.write('INHERIT += "rm_work"\n')
@@ -60,10 +60,10 @@ class Test1P3(BuildPerfTestCase): class Test2(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test2(self): - """Run core-image-sato do_rootfs with sstate""" + """Run core-image-weston do_rootfs with sstate""" # Build once in order to populate sstate cache self.run_cmd(['bitbake', self.build_target])
@@ -93,7 +93,7 @@ class Test3(BuildPerfTestCase): class Test4(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test4(self): """eSDK metrics"""
Signature · 1 line
2.29.1
RFC PATCH 3/12 oeqa/core/tests/test_data.py: use weston image instead of sato
In reply to Alexander Kanavin--- meta/lib/oeqa/core/tests/test_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/core/tests/test_data.py +1 -1
@@ -33,7 +33,7 @@ class TestData(TestBase): def test_data_fail_wrong_variable(self): expectedError = 'AssertionError' - d = {'IMAGE' : 'core-image-sato', 'ARCH' : 'arm'} + d = {'IMAGE' : 'core-image-weston', 'ARCH' : 'arm'} tc = self._testLoader(d=d, modules=self.modules) results = tc.runTests()
Signature · 1 line
2.29.1
RFC PATCH 4/12 oeqa/selftest: transition to weston images
In reply to Alexander KanavinFor readonly rootfs and reproducibility tests core-image-weston is appended; everywhere else it replaces core-image-sato.
--- meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | 4 ++-- meta/lib/oeqa/selftest/cases/buildoptions.py | 4 ++-- meta/lib/oeqa/selftest/cases/imagefeatures.py | 6 +++--- meta/lib/oeqa/selftest/cases/reproducible.py | 2 +- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 -- meta/lib/oeqa/selftest/cases/sstatetests.py | 10 +++++----- 6 files changed, 13 insertions(+), 15 deletions(-)
meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py +2 -2
@@ -90,7 +90,7 @@ class RebuildFromSState(SStateBase): self.assertFalse(failed_cleansstate, msg="The following recipes have failed cleansstate(all others have passed both cleansstate and rebuild from sstate tests): %s" % ' '.join(map(str, failed_cleansstate))) def test_sstate_relocation(self): - self.run_test_sstate_rebuild(['core-image-sato-sdk'], relocate=True, rebuild_dependencies=True) + self.run_test_sstate_rebuild(['core-image-weston-sdk'], relocate=True, rebuild_dependencies=True) def test_sstate_rebuild(self): - self.run_test_sstate_rebuild(['core-image-sato-sdk'], relocate=False, rebuild_dependencies=True) + self.run_test_sstate_rebuild(['core-image-weston-sdk'], relocate=False, rebuild_dependencies=True)
meta/lib/oeqa/selftest/cases/buildoptions.py +2 -2
@@ -49,9 +49,9 @@ class ImageOptionsTests(OESelftestTestCase): def test_read_only_image(self): distro_features = get_bb_var('DISTRO_FEATURES') if not ('x11' in distro_features and 'opengl' in distro_features): - self.skipTest('core-image-sato requires x11 and opengl in distro features') + self.skipTest('core-image-sato/weston requires x11 and opengl in distro features') self.write_config('IMAGE_FEATURES += "read-only-rootfs"') - bitbake("core-image-sato") + bitbake("core-image-sato core-image-weston") # do_image will fail if there are any pending postinsts class DiskMonTest(OESelftestTestCase):
meta/lib/oeqa/selftest/cases/imagefeatures.py +3 -3
@@ -240,8 +240,8 @@ USERADD_GID_TABLES += "files/static-group" def test_no_busybox_base_utils(self): config = """ -# Enable x11 -DISTRO_FEATURES_append += "x11" +# Enable wayland +DISTRO_FEATURES_append += "pam opengl wayland" # Switch to systemd DISTRO_FEATURES += "systemd"
@@ -262,7 +262,7 @@ PNBLACKLIST[busybox] = "Don't build this" """ self.write_config(config) - bitbake("--graphviz core-image-sato") + bitbake("--graphviz core-image-weston") def test_fit_image(self): """
meta/lib/oeqa/selftest/cases/reproducible.py +1 -1
@@ -105,7 +105,7 @@ class DiffoscopeTests(OESelftestTestCase): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] - images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] + images = ['core-image-minimal', 'core-image-sato', 'core-image-weston', 'core-image-full-cmdline'] save_results = False if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT']
meta/lib/oeqa/selftest/cases/runtime_test.py +0 -2
@@ -128,7 +128,6 @@ class TestImage(OESelftestTestCase): features += 'TEST_SUITES = "ping ssh selftest"\n' self.write_config(features) - # Build core-image-sato and testimage bitbake('core-image-full-cmdline socat') bitbake('-c testimage core-image-full-cmdline')
@@ -164,7 +163,6 @@ class TestImage(OESelftestTestCase): features += 'PSEUDO_IGNORE_PATHS .= ",%s"\n' % self.gpg_home self.write_config(features) - # Build core-image-sato and testimage bitbake('core-image-full-cmdline socat') bitbake('-c testimage core-image-full-cmdline')
meta/lib/oeqa/selftest/cases/sstatetests.py +5 -5
@@ -261,7 +261,7 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb" BB_SIGNATURE_HANDLER = "OEBasicHash" """) self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") - bitbake("core-image-sato -S none") + bitbake("core-image-weston -S none") self.write_config(""" MACHINE = "qemux86" TMPDIR = "${TOPDIR}/tmp-sstatesamehash2"
@@ -273,12 +273,12 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb" BB_SIGNATURE_HANDLER = "OEBasicHash" """) self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") - bitbake("core-image-sato -S none") + bitbake("core-image-weston -S none") def get_files(d): f = [] for root, dirs, files in os.walk(d): - if "core-image-sato" in root: + if "core-image-weston" in root: # SDKMACHINE changing will change # do_rootfs/do_testimage/do_build stamps of images which # is safe to ignore.
@@ -306,7 +306,7 @@ NATIVELSBSTRING = \"DistroA\" BB_SIGNATURE_HANDLER = "OEBasicHash" """) self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") - bitbake("core-image-sato -S none") + bitbake("core-image-weston -S none") self.write_config(""" TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" TCLIBCAPPEND = \"\"
@@ -314,7 +314,7 @@ NATIVELSBSTRING = \"DistroB\" BB_SIGNATURE_HANDLER = "OEBasicHash" """) self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") - bitbake("core-image-sato -S none") + bitbake("core-image-weston -S none") def get_files(d): f = []
Signature · 1 line
2.29.1
RFC PATCH 5/12 core-image-multilib-example: base on weston, and not sato
In reply to Alexander Kanavin--- .../recipes-multilib/images/core-image-multilib-example.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb +1 -1
@@ -7,7 +7,7 @@ # # First include a base image to base things off -require recipes-sato/images/core-image-sato.bb +require recipes-graphics/images/core-image-weston.bb # Now add the multilib packages we want to install IMAGE_INSTALL += "lib32-bash"
Signature · 1 line
2.29.1
RFC PATCH 6/12 default-distrovars.inc: add wayland/opengl to default distro features
In reply to Alexander KanavinThis puts them on equal terms with x11 distro feature (which I think is due).
--- meta/conf/distro/include/default-distrovars.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +1 -1
@@ -10,7 +10,7 @@ LOCALE_UTF8_ONLY ?= "0" LOCALE_UTF8_IS_DEFAULT ?= "1" LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0" -DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat" +DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat wayland opengl" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}" IMAGE_FEATURES ?= ""
Signature · 1 line
2.29.1
RFC PATCH 7/12 conf-notes.txt: mention more important images than just sato
In reply to Alexander Kanavin--- meta/conf/conf-notes.txt | 2 ++ 1 file changed, 2 insertions(+)
meta/conf/conf-notes.txt +2 -0
@@ -5,7 +5,9 @@ You can now run 'bitbake <target>' Common targets are: core-image-minimal + core-image-full-cmdline core-image-sato + core-image-weston meta-toolchain meta-ide-support
Signature · 1 line
2.29.1
RFC PATCH 8/12 weston-init: correctly start under systemd
In reply to Alexander KanavinSeveral issues are addressed:
1. weston requires pam when starting under systemd
2. systemd was attempting to launch weston twice (from sysvinit script and from systemd unit file) which caused confusion and errors.
3. runtime test should stop/start weston via systemd only if systemd actually controls system startup, not merely when systemd is present.
--- meta/lib/oeqa/runtime/cases/weston.py | 4 ++-- meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
meta/lib/oeqa/runtime/cases/weston.py +2 -2
@@ -34,7 +34,7 @@ class WestonTest(OERuntimeTestCase): return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd def run_weston_init(self): - if 'systemd' in self.tc.td['DISTRO_FEATURES']: + if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file) else: self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-1 --log=%s' % self.weston_log_file))
@@ -66,7 +66,7 @@ class WestonTest(OERuntimeTestCase): new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes) existing_and_new_weston_processes = self.get_processes_of('weston', 'existing and new') new_weston_processes = [x for x in existing_and_new_weston_processes if x not in existing_weston_processes] - if 'systemd' in self.tc.td['DISTRO_FEATURES']: + if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: self.target.run('systemctl stop weston-ptest.service') else: for w in new_weston_processes:
meta/recipes-graphics/wayland/weston-init.bb +7 -2
@@ -26,7 +26,9 @@ DEFAULTBACKEND_qemux86 = "drm" DEFAULTBACKEND_qemux86-64 = "drm" do_install() { - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + fi install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston
@@ -55,10 +57,13 @@ do_install() { fi } +INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}" + inherit update-rc.d features_check systemd # rdepends on weston which depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" +# requires pam enabled if started via systemd +REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" RDEPENDS_${PN} = "weston kbd"
Signature · 1 line
2.29.1
RFC PATCH 9/12 weston-init: fall back to fbdev under x32
In reply to Alexander KanavinOtherwise, there's a crash in swrast - the same issue as with X11.
--- meta/recipes-graphics/wayland/weston-init.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-graphics/wayland/weston-init.bb +3 -0
@@ -24,6 +24,9 @@ DEFAULTBACKEND_qemuall ?= "fbdev" DEFAULTBACKEND_qemuarm64 = "drm" DEFAULTBACKEND_qemux86 = "drm" DEFAULTBACKEND_qemux86-64 = "drm" +# gallium swrast was found to crash weston on startup in x32 qemu +DEFAULTBACKEND_qemux86-64_x86-x32 = "fbdev" +DEFAULTBACKEND_x86-x32 = "fbdev" do_install() { if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
Signature · 1 line
2.29.1
RFC PATCH 10/12 wayland-utils: introduce a recipe
In reply to Alexander Kanavinwayland-utils contains wayland-info utility which deprecates and replaces weston-info from weston.
--- meta/conf/distro/include/maintainers.inc | 1 + meta/lib/oeqa/runtime/cases/weston.py | 8 ++++---- .../images/core-image-weston.bb | 2 +- .../wayland/wayland-utils_1.0.0.bb | 20 +++++++++++++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -724,6 +724,7 @@ RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <[email protected]>" +RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <[email protected]>"
meta/lib/oeqa/runtime/cases/weston.py +4 -4
@@ -51,10 +51,10 @@ class WestonTest(OERuntimeTestCase): return new_wl_processes, try_cnt - @OEHasPackage(['weston']) - def test_weston_info(self): - status, output = self.target.run(self.get_weston_command('weston-info')) - self.assertEqual(status, 0, msg='weston-info error: %s' % output) + @OEHasPackage(['wayland-utils']) + def test_wayland_info(self): + status, output = self.target.run(self.get_weston_command('wayland-info')) + self.assertEqual(status, 0, msg='wayland-info error: %s' % output) @OEHasPackage(['weston']) def test_weston_can_initialize_new_wayland_compositor(self):
meta/recipes-graphics/images/core-image-weston.bb +1 -1
@@ -8,7 +8,7 @@ inherit core-image features_check REQUIRED_DISTRO_FEATURES = "wayland" -CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" +CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples wayland-utils gtk+3-demo clutter-1.0-examples" CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" QB_MEM = "-m 512"
meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb new file +20 -0
@@ -0,0 +1,20 @@ +SUMMARY = "Wayland utilities" +DESCRIPTION = "Wayland-utils contains (for now) \ +wayland-info, a utility for displaying information about the Wayland \ +protocols supported by a Wayland compositor. \ +wayland-info is basically a standalone version of weston-info as found \ +in weston repository. " +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ + " + +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + " +SRC_URI[sha256sum] = "64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +inherit meson pkgconfig + +DEPENDS += "wayland wayland-native wayland-protocols"
Signature · 1 line
2.29.1
RFC PATCH 11/12 poky/conf-notes.txt: mention more important images than just sato
In reply to Alexander Kanavin--- meta-poky/conf/conf-notes.txt | 2 ++ 1 file changed, 2 insertions(+)
meta-poky/conf/conf-notes.txt +2 -0
@@ -5,7 +5,9 @@ You can now run 'bitbake <target>' Common targets are: core-image-minimal + core-image-full-cmdline core-image-sato + core-image-weston meta-toolchain meta-ide-support
Signature · 1 line
2.29.1
RFC PATCH 12/12 poky.conf: remove wayland/opengl from distro features, as it is now oe-core default
In reply to Alexander Kanavin--- meta-poky/conf/distro/poky.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +1 -1
@@ -15,7 +15,7 @@ DISTRO_VERSION[vardepsexclude] = "DATE" SDK_VERSION[vardepsexclude] = "DATE" # Override these in poky based distros -POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" +POKY_DEFAULT_DISTRO_FEATURES = "largefile ptest multiarch vulkan" POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
Signature · 1 line
2.29.1
Re: [OE-core] [RFC PATCH 02/12] oeqa/buildperf: use weston image instead of sato
In reply to Alexander KanavinQuoted 50 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/lib/oeqa/buildperf/test_basic.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)meta/lib/oeqa/buildperf/test_basic.py +6
-6@@ -11,10 +11,10 @@ from oeqa.buildperf import BuildPerfTestCase from oeqa.utils.commands import get_bb_var, get_bb_vars class Test1P1(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test1(self): - """Build core-image-sato""" + """Build core-image-weston""" self.rm_tmp() self.rm_sstate() self.rm_cache()@@ -40,10 +40,10 @@ class Test1P2(BuildPerfTestCase): class Test1P3(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test13(self): - """Build core-image-sato with rm_work enabled""" + """Build core-image-weston with rm_work enabled""" postfile = os.path.join(self.tmp_dir, 'postfile.conf') with open(postfile, 'w') as fobj: fobj.write('INHERIT += "rm_work"\n')@@ -60,10 +60,10 @@ class Test1P3(BuildPerfTestCase): class Test2(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test2(self): - """Run core-image-sato do_rootfs with sstate""" + """Run core-image-weston do_rootfs with sstate""" # Build once in order to populate sstate cache self.run_cmd(['bitbake', self.build_target])
meta/lib/oeqa/buildperf/test_basic.py class Test3(BuildPerfTestCase): · line 99
Quoted 8 lines
meta/lib/oeqa/buildperf/test_basic.py +1
-1@@ -93,7 +93,7 @@ class Test3(BuildPerfTestCase): class Test4(BuildPerfTestCase): - build_target = 'core-image-sato' + build_target = 'core-image-weston' def test4(self): """eSDK metrics"""
This change is a big deal since it means numbers are no longer comparable and we have quite the history of these build numbers. Not quite sure how I feel about that...
Cheers,
Richard
Re: [OE-core] [RFC PATCH 08/12] weston-init: correctly start under systemd
In reply to Alexander Kanavinweston rdepends on weston-init, so it needs ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)} as well now, will send patch shortly.
ERROR: Nothing RPROVIDES 'weston-init' (but openembedded-core/meta/recipes-graphics/wayland/weston_9.0.0.bb RDEPENDS on or otherwise requires it)
weston-init was skipped: missing required distro feature 'pam' (not in DISTRO_FEATURES)
NOTE: Runtime target 'weston-init' is unbuildable, removing... Missing or unbuildable dependency chain was: ['weston-init']
ERROR: Nothing RPROVIDES 'weston-dev' (but openembedded-core/meta/recipes-graphics/wayland/weston_9.0.0.bb RDEPENDS on or otherwise requires it)
No eligible RPROVIDERs exist for 'weston-dev'
NOTE: Runtime target 'weston-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['weston-dev']
ERROR: Nothing RPROVIDES 'weston' (but openembedded-core/meta/recipes-graphics/wayland/weston_9.0.0.bb RDEPENDS on or otherwise requires it)
No eligible RPROVIDERs exist for 'weston'
NOTE: Runtime target 'weston' is unbuildable, removing... Missing or unbuildable dependency chain was: ['weston']
Quoted 90 lines · Alexander Kanavin
Several issues are addressed:
1. weston requires pam when starting under systemd
2. systemd was attempting to launch weston twice (from sysvinit script and from systemd unit file) which caused confusion and errors.
3. runtime test should stop/start weston via systemd only if systemd actually controls system startup, not merely when systemd is present.Signed-off-by Alexander Kanavin <[email protected]>--- meta/lib/oeqa/runtime/cases/weston.py | 4 ++-- meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)meta/lib/oeqa/runtime/cases/weston.py +0
-0@@ -34,7 +34,7 @@ class WestonTest(OERuntimeTestCase): return 'export XDG_RUNTIME_DIR=/run/user/0; exportWAYLAND_DISPLAY=wayland-0; %s' % cmd
def
run_weston_init(self):meta/lib/oeqa/runtime/cases/weston.py +1
-5- if 'systemd' in self.tc.td['DISTRO_FEATURES']: + if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file) else: self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-1 --log=%s' % self.weston_log_file))@@ -66,7 +66,7 @@ class WestonTest(OERuntimeTestCase): new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes) existing_and_new_weston_processes = self.get_processes_of('weston', 'existing and new') new_weston_processes = [x for x in
existing_and_new_weston_processesif x not inexisting_weston_processes]meta/lib/oeqa/runtime/cases/weston.py +1
-1- if 'systemd' in self.tc.td['DISTRO_FEATURES']: + if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: self.target.run('systemctl stop weston-ptest.service') else: for w in new_weston_processes:meta/recipes-graphics/wayland/weston-init.bb +2
-1@@ -26,7 +26,9 @@ DEFAULTBACKEND_qemux86 = "drm" DEFAULTBACKEND_qemux86-64 = "drm" do_install() { - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + install -Dm755 ${WORKDIR}/init${D}/${sysconfdir}/init.d/weston
+ fiinstall -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini install -Dm644 ${WORKDIR}/weston.env${D}${sysconfdir}/default/weston
meta/recipes-graphics/wayland/weston-init.bb +1
-0@@ -55,10 +57,13 @@ do_install() { fi } +INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1','', d)}"
meta/recipes-graphics/wayland/weston-init.bb +3
-1+ inherit update-rc.d features_check systemd # rdepends on weston which depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" +# requires pam enabled if started via systemd +REQUIRED_DISTRO_FEATURES = "opengl${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}"
RDEPENDS_${PN} = "weston kbd"
--
2.29.1