diff options
author | Ross Burton <ross@burtonini.com> | 2021-06-01 17:21:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-03 23:09:42 +0100 |
commit | 84317082015afa3ac7e9eeb23139861ec2c0d220 (patch) | |
tree | 3f752b20a4a2680796c83528d6cf81a0c88cfdc8 /meta/conf | |
parent | 0eb836a58fe62232cf57a47b9ae256c50ff914ef (diff) | |
download | poky-84317082015afa3ac7e9eeb23139861ec2c0d220.tar.gz |
Remove Clutter and Cogl
Clutter and Cogl are not used by anything in oe-core, and in Gnome are
legacy components so are only used by a few applications. The recipes
have already been moved to meta-gnome so they can now be removed from
oe-core.
(From OE-Core rev: c4f167d05f58f35a6b94e8dbc4721ab67e7e71eb)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/distro_alias.inc | 11 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 5 | ||||
-rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 2 |
3 files changed, 0 insertions, 18 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index b4dfcfc5f5..001d269346 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -26,21 +26,11 @@ DISTRO_PN_ALIAS_pn-builder = "OE-Core" | |||
26 | DISTRO_PN_ALIAS_pn-buildtools-tarball = "OE-Core" | 26 | DISTRO_PN_ALIAS_pn-buildtools-tarball = "OE-Core" |
27 | DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT" | 27 | DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT" |
28 | DISTRO_PN_ALIAS_pn-chkconfig-alternatives = "Mandriva=chkconfig Debian=chkconfig" | 28 | DISTRO_PN_ALIAS_pn-chkconfig-alternatives = "Mandriva=chkconfig Debian=chkconfig" |
29 | DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter" | ||
30 | DISTRO_PN_ALIAS_pn-clutter-1.8 = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter" | ||
31 | DISTRO_PN_ALIAS_pn-clutter-gst-1.0 = "Debian=clutter-gst Ubuntu=clutter-gst Fedora=clutter-gst" | ||
32 | DISTRO_PN_ALIAS_pn-clutter-gst-1.8 = "Fedora=clutter-gst Debian=libclutter-gst" | ||
33 | DISTRO_PN_ALIAS_pn-clutter-gst-3.0 = "Ubuntu=libclutter-gst Debian=libclutter-gst" | ||
34 | DISTRO_PN_ALIAS_pn-clutter-gtk-1.0 = "Debian=clutter-gtk Ubuntu=clutter-gtk Fedora=clutter-gtk" | ||
35 | DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk" | ||
36 | DISTRO_PN_ALIAS_pn-cogl-1.0 = "Debian=cogl Ubuntu=cogl Fedora=cogl" | ||
37 | DISTRO_PN_ALIAS_pn-cogl = "Fedora=cogl OpenSuse=cogl Ubuntu=cogl Mandriva=cogl Debian=cogl" | ||
38 | DISTRO_PN_ALIAS_pn-connman = "Meego=connman" | 29 | DISTRO_PN_ALIAS_pn-connman = "Meego=connman" |
39 | DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core" | 30 | DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core" |
40 | DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" | 31 | DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" |
41 | DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools" | 32 | DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools" |
42 | DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core" | 33 | DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core" |
43 | DISTRO_PN_ALIAS_pn-core-image-clutter = "OE-Core" | ||
44 | DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core" | 34 | DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core" |
45 | DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" | 35 | DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" |
46 | DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" | 36 | DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" |
@@ -248,7 +238,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" | |||
248 | DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" | 238 | DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" |
249 | DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core" | 239 | DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core" |
250 | DISTRO_PN_ALIAS_pn-packagegroup-core-buildessential = "OE-Core" | 240 | DISTRO_PN_ALIAS_pn-packagegroup-core-buildessential = "OE-Core" |
251 | DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core" | ||
252 | DISTRO_PN_ALIAS_pn-packagegroup-core-device-devel = "OE-Core" | 241 | DISTRO_PN_ALIAS_pn-packagegroup-core-device-devel = "OE-Core" |
253 | DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" | 242 | DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" |
254 | DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" | 243 | DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 669863e679..ee118209db 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -93,12 +93,8 @@ RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.co | |||
93 | RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>" | 93 | RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>" |
94 | RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>" | 94 | RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>" |
95 | RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>" | 95 | RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>" |
96 | RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@arm.com>" | ||
97 | RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton <ross.burton@arm.com>" | ||
98 | RECIPE_MAINTAINER_pn-clutter-gtk-1.0 = "Ross Burton <ross.burton@arm.com>" | ||
99 | RECIPE_MAINTAINER_pn-cmake = "Pascal Bach <pascal.bach@siemens.com>" | 96 | RECIPE_MAINTAINER_pn-cmake = "Pascal Bach <pascal.bach@siemens.com>" |
100 | RECIPE_MAINTAINER_pn-cmake-native = "Pascal Bach <pascal.bach@siemens.com>" | 97 | RECIPE_MAINTAINER_pn-cmake-native = "Pascal Bach <pascal.bach@siemens.com>" |
101 | RECIPE_MAINTAINER_pn-cogl-1.0 = "Ross Burton <ross.burton@arm.com>" | ||
102 | RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <changhyeok.bae@gmail.com>" | 98 | RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <changhyeok.bae@gmail.com>" |
103 | RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <ross.burton@arm.com>" | 99 | RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <ross.burton@arm.com>" |
104 | RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <ross.burton@arm.com>" | 100 | RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <ross.burton@arm.com>" |
@@ -117,7 +113,6 @@ RECIPE_MAINTAINER_pn-core-image-sato = "Richard Purdie <richard.purdie@linuxfoun | |||
117 | RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 113 | RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
118 | RECIPE_MAINTAINER_pn-core-image-testmaster-initramfs = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 114 | RECIPE_MAINTAINER_pn-core-image-testmaster-initramfs = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
119 | RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 115 | RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
120 | RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxfoundation.org>" | ||
121 | RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 116 | RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
122 | RECIPE_MAINTAINER_pn-core-image-weston-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 117 | RECIPE_MAINTAINER_pn-core-image-weston-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
123 | RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 118 | RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index aef70343f6..d489ad8200 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
@@ -88,7 +88,6 @@ PTESTS_SLOW_remove_riscv64 = "valgrind-ptest" | |||
88 | PTESTS_PROBLEMS_append_riscv64 = "valgrind-ptest" | 88 | PTESTS_PROBLEMS_append_riscv64 = "valgrind-ptest" |
89 | 89 | ||
90 | # ruby-ptest \ # Timeout | 90 | # ruby-ptest \ # Timeout |
91 | # clutter-1.0-ptest \ # Doesn't build due to depends on cogl-1.0 | ||
92 | # lz4-ptest \ # Needs a rewrite | 91 | # lz4-ptest \ # Needs a rewrite |
93 | # rt-tests-ptest \ # Needs to be checked whether it runs at all | 92 | # rt-tests-ptest \ # Needs to be checked whether it runs at all |
94 | # bash-ptest \ # Test outcomes are non-deterministic by design | 93 | # bash-ptest \ # Test outcomes are non-deterministic by design |
@@ -102,7 +101,6 @@ PTESTS_PROBLEMS_append_riscv64 = "valgrind-ptest" | |||
102 | 101 | ||
103 | PTESTS_PROBLEMS = "\ | 102 | PTESTS_PROBLEMS = "\ |
104 | ruby-ptest \ | 103 | ruby-ptest \ |
105 | clutter-1.0-ptest \ | ||
106 | lz4-ptest \ | 104 | lz4-ptest \ |
107 | rt-tests-ptest \ | 105 | rt-tests-ptest \ |
108 | bash-ptest \ | 106 | bash-ptest \ |