summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-04-03 23:07:05 +0200
committerArmin Kuster <akuster808@gmail.com>2021-04-07 09:37:36 -0700
commit7a854b90c35a9607cb63298d401ec2a0adea93e1 (patch)
treee92e20f0bce971e3a97a22ac1fb7f5750705051b
parentf282f0829a4deb8e9ae215819b972d27fac0f7ac (diff)
downloadmeta-openembedded-7a854b90c35a9607cb63298d401ec2a0adea93e1.tar.gz
packagegroup-meta-oe: include glfw, icewm, geis only with x11 in DISTRO_FEATURES
* and also opengl for glfw Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 3bffa82504f27d2da7ca87aeda799632b717d831) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 4eb2e8c11c..2958eac6a0 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -192,7 +192,7 @@ RDEPENDS_packagegroup-meta-oe-core = "\
192 usleep \ 192 usleep \
193 dbus-cxx \ 193 dbus-cxx \
194" 194"
195RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " glfw" 195RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "glfw", "", d)}"
196RDEPENDS_packagegroup-meta-oe-core_remove_riscv64 = "safec" 196RDEPENDS_packagegroup-meta-oe-core_remove_riscv64 = "safec"
197RDEPENDS_packagegroup-meta-oe-core_remove_riscv32 = "safec" 197RDEPENDS_packagegroup-meta-oe-core_remove_riscv32 = "safec"
198 198
@@ -355,7 +355,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\
355 libuio \ 355 libuio \
356 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \ 356 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
357 lprng \ 357 lprng \
358 icewm \ 358 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \
359 md5deep \ 359 md5deep \
360 indent \ 360 indent \
361 jansson \ 361 jansson \
@@ -712,7 +712,6 @@ RDEPENDS_packagegroup-meta-oe-support ="\
712 ace-cloud-editor \ 712 ace-cloud-editor \
713 frame \ 713 frame \
714 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \ 714 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
715 geis \
716 grail \ 715 grail \
717 asio \ 716 asio \
718 augeas \ 717 augeas \