* [RFC PATCH 02/12] oeqa/buildperf: use weston image instead of sato
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 17:16 ` [OE-core] " Richard Purdie
2020-11-09 8:31 ` [RFC PATCH 03/12] oeqa/core/tests/test_data.py: " Alexander Kanavin
` (9 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/lib/oeqa/buildperf/test_basic.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py
index 2104617ba3..0fe7d3c8dc 100644
--- a/meta/lib/oeqa/buildperf/test_basic.py
+++ b/meta/lib/oeqa/buildperf/test_basic.py
@@ -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"""
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [OE-core] [RFC PATCH 02/12] oeqa/buildperf: use weston image instead of sato
2020-11-09 8:31 ` [RFC PATCH 02/12] oeqa/buildperf: use weston image instead of sato Alexander Kanavin
@ 2020-11-09 17:16 ` Richard Purdie
0 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2020-11-09 17:16 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On Mon, 2020-11-09 at 09:31 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/lib/oeqa/buildperf/test_basic.py | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/meta/lib/oeqa/buildperf/test_basic.py
> b/meta/lib/oeqa/buildperf/test_basic.py
> index 2104617ba3..0fe7d3c8dc 100644
> --- a/meta/lib/oeqa/buildperf/test_basic.py
> +++ b/meta/lib/oeqa/buildperf/test_basic.py
> @@ -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"""
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [RFC PATCH 03/12] oeqa/core/tests/test_data.py: use weston image instead of sato
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 02/12] oeqa/buildperf: use weston image instead of sato Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 04/12] oeqa/selftest: transition to weston images Alexander Kanavin
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/lib/oeqa/core/tests/test_data.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/core/tests/test_data.py b/meta/lib/oeqa/core/tests/test_data.py
index ac74098b78..acd726f3a0 100755
--- a/meta/lib/oeqa/core/tests/test_data.py
+++ b/meta/lib/oeqa/core/tests/test_data.py
@@ -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()
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 04/12] oeqa/selftest: transition to weston images
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 02/12] oeqa/buildperf: use weston image instead of sato Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 03/12] oeqa/core/tests/test_data.py: " Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 05/12] core-image-multilib-example: base on weston, and not sato Alexander Kanavin
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
For readonly rootfs and reproducibility tests core-image-weston
is appended; everywhere else it replaces core-image-sato.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
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(-)
diff --git a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
index f7c356ad09..7ac03f0cec 100644
--- a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
+++ b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
@@ -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)
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index e91f0bd18f..fef1250ba5 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -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):
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 415e0315fc..c23d648fa4 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -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):
"""
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index a7ef336143..2b48791634 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -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']
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 1bb1c4bee4..48d9ca9466 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -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')
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index c46e8ba489..9db2a0bb44 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -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 = []
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 05/12] core-image-multilib-example: base on weston, and not sato
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (2 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 04/12] oeqa/selftest: transition to weston images Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 06/12] default-distrovars.inc: add wayland/opengl to default distro features Alexander Kanavin
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../recipes-multilib/images/core-image-multilib-example.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb b/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
index f13186f933..77e5b2118d 100644
--- a/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
+++ b/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
@@ -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"
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 06/12] default-distrovars.inc: add wayland/opengl to default distro features
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (3 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 05/12] core-image-multilib-example: base on weston, and not sato Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 07/12] conf-notes.txt: mention more important images than just sato Alexander Kanavin
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
This puts them on equal terms with x11 distro feature
(which I think is due).
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/distro/include/default-distrovars.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 433d4b6651..0927e9c0ad 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -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 ?= ""
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 07/12] conf-notes.txt: mention more important images than just sato
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (4 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 06/12] default-distrovars.inc: add wayland/opengl to default distro features Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 08/12] weston-init: correctly start under systemd Alexander Kanavin
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/conf-notes.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/conf-notes.txt b/meta/conf/conf-notes.txt
index 5af13a8357..1a9414a040 100644
--- a/meta/conf/conf-notes.txt
+++ b/meta/conf/conf-notes.txt
@@ -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
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 08/12] weston-init: correctly start under systemd
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (5 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 07/12] conf-notes.txt: mention more important images than just sato Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-14 8:46 ` [OE-core] " Martin Jansa
2020-11-09 8:31 ` [RFC PATCH 09/12] weston-init: fall back to fbdev under x32 Alexander Kanavin
` (3 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: 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 <alex.kanavin@gmail.com>
---
meta/lib/oeqa/runtime/cases/weston.py | 4 ++--
meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index 36b4f9e375..d3fbf8ba92 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -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:
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index b7a99be646..4b2a6ca983 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -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"
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [OE-core] [RFC PATCH 08/12] weston-init: correctly start under systemd
2020-11-09 8:31 ` [RFC PATCH 08/12] weston-init: correctly start under systemd Alexander Kanavin
@ 2020-11-14 8:46 ` Martin Jansa
0 siblings, 0 replies; 14+ messages in thread
From: Martin Jansa @ 2020-11-14 8:46 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 4867 bytes --]
weston 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']
On Mon, Nov 9, 2020 at 9:32 AM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> 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 <alex.kanavin@gmail.com>
> ---
> meta/lib/oeqa/runtime/cases/weston.py | 4 ++--
> meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++--
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/meta/lib/oeqa/runtime/cases/weston.py
> b/meta/lib/oeqa/runtime/cases/weston.py
> index 36b4f9e375..d3fbf8ba92 100644
> --- a/meta/lib/oeqa/runtime/cases/weston.py
> +++ b/meta/lib/oeqa/runtime/cases/weston.py
> @@ -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:
> diff --git a/meta/recipes-graphics/wayland/weston-init.bb
> b/meta/recipes-graphics/wayland/weston-init.bb
> index b7a99be646..4b2a6ca983 100644
> --- a/meta/recipes-graphics/wayland/weston-init.bb
> +++ b/meta/recipes-graphics/wayland/weston-init.bb
> @@ -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"
>
> --
> 2.29.1
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 6717 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [RFC PATCH 09/12] weston-init: fall back to fbdev under x32
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (6 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 08/12] weston-init: correctly start under systemd Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 10/12] wayland-utils: introduce a recipe Alexander Kanavin
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Otherwise, there's a crash in swrast - the same issue as with
X11.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/wayland/weston-init.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index 4b2a6ca983..0cc32985c1 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -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
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 10/12] wayland-utils: introduce a recipe
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (7 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 09/12] weston-init: fall back to fbdev under x32 Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 11/12] poky/conf-notes.txt: mention more important images than just sato Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 12/12] poky.conf: remove wayland/opengl from distro features, as it is now oe-core default Alexander Kanavin
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
wayland-utils contains wayland-info utility which deprecates
and replaces weston-info from weston.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
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
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index ae04ef07c1..0911ddd461 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -724,6 +724,7 @@ RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denys@ti.com>"
RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys@ti.com>"
+RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko <denys@ti.com>"
RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@ti.com>"
RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@ti.com>"
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index d3fbf8ba92..a1c7183213 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -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):
diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb
index fa7e9ef421..8d88e3bc0c 100644
--- a/meta/recipes-graphics/images/core-image-weston.bb
+++ b/meta/recipes-graphics/images/core-image-weston.bb
@@ -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"
diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb
new file mode 100644
index 0000000000..4c51f7e8c5
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb
@@ -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"
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 11/12] poky/conf-notes.txt: mention more important images than just sato
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (8 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 10/12] wayland-utils: introduce a recipe Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
2020-11-09 8:31 ` [RFC PATCH 12/12] poky.conf: remove wayland/opengl from distro features, as it is now oe-core default Alexander Kanavin
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta-poky/conf/conf-notes.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-poky/conf/conf-notes.txt b/meta-poky/conf/conf-notes.txt
index 67c177db40..084cc98369 100644
--- a/meta-poky/conf/conf-notes.txt
+++ b/meta-poky/conf/conf-notes.txt
@@ -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
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH 12/12] poky.conf: remove wayland/opengl from distro features, as it is now oe-core default
2020-11-09 8:31 [RFC PATCH 01/12] core-image-weston: add sdk/ptest images Alexander Kanavin
` (9 preceding siblings ...)
2020-11-09 8:31 ` [RFC PATCH 11/12] poky/conf-notes.txt: mention more important images than just sato Alexander Kanavin
@ 2020-11-09 8:31 ` Alexander Kanavin
10 siblings, 0 replies; 14+ messages in thread
From: Alexander Kanavin @ 2020-11-09 8:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta-poky/conf/distro/poky.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 31dc110bf6..f9050a1718 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -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"
--
2.29.1
^ permalink raw reply related [flat|nested] 14+ messages in thread