From 0df4075e78f33ff0b9a9d7553eaf496bf2cbb051 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Fri, 4 Jun 2021 17:40:47 +0200 Subject: recipes-graphics: clutter/cogl: move bbappend to dynamic layers As it breaks the build on master since [1]. Move bbappend files to dynamic layers since recipes were moved to meta-gnome Fixes: ERROR: No recipes in default available for: /home/bdx-iot/ci/meta-freescale/recipes-graphics/clutter/clutter-1.0_%.bbappend /home/bdx-iot/ci/meta-freescale/recipes-graphics/cogl/cogl-1.0_%.bbappend [1] - http://git.openembedded.org/openembedded-core/commit/?id=c4f167d05f58f35a6b94e8dbc4721ab67e7e71eb Signed-off-by: Pierre-Jean Texier --- conf/layer.conf | 3 +++ .../gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend | 5 +++++ dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend | 5 +++++ recipes-graphics/clutter/clutter-1.0_%.bbappend | 5 ----- recipes-graphics/cogl/cogl-1.0_%.bbappend | 5 ----- 5 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend create mode 100644 dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend delete mode 100644 recipes-graphics/clutter/clutter-1.0_%.bbappend delete mode 100644 recipes-graphics/cogl/cogl-1.0_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index df8989249..e07b65ab7 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -34,6 +34,9 @@ BBFILES_DYNAMIC += " \ filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bb \ filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bbappend \ \ + gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/*/*/*.bb \ + gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/*/*/*.bbappend \ + \ ivi:${LAYERDIR}/dynamic-layers/ivi/*/*/*.bb \ ivi:${LAYERDIR}/dynamic-layers/ivi/*/*/*.bbappend \ \ diff --git a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend new file mode 100644 index 000000000..0b4c4861b --- /dev/null +++ b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG_imxgpu3d ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \ + '', d), d)} \ +" diff --git a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend new file mode 100644 index 000000000..afbaee432 --- /dev/null +++ b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG_imxgpu3d ??= " \ + cogl-pango gles2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \ + '', d), d)}" diff --git a/recipes-graphics/clutter/clutter-1.0_%.bbappend b/recipes-graphics/clutter/clutter-1.0_%.bbappend deleted file mode 100644 index 0b4c4861b..000000000 --- a/recipes-graphics/clutter/clutter-1.0_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG_imxgpu3d ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \ - '', d), d)} \ -" diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend deleted file mode 100644 index afbaee432..000000000 --- a/recipes-graphics/cogl/cogl-1.0_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG_imxgpu3d ??= " \ - cogl-pango gles2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \ - '', d), d)}" -- cgit v1.2.3-54-g00ecf