diff mbox series

[meta-games] dynamic-layers: Move freeciv and gnome-games to dynamic layers

Message ID 20220819221104.334600-1-marex@denx.de
State New
Headers show
Series [meta-games] dynamic-layers: Move freeciv and gnome-games to dynamic layers | expand

Commit Message

Marek Vasut Aug. 19, 2022, 10:11 p.m. UTC 
Move freeciv and gnome-games to qt5 and gnome dynamic layers.
Use BBFILES_DYNAMIC to dynamically make recipes which depend
on meta-qt5 and meta-gnome available only in case those layers
are present in bblayers.conf, thus reducing the need of adding
possibly unneeded layers to build (e.g. to build neverball, no
need for meta-qt5).

Signed-off-by: Marek Vasut <marex@denx.de>
---
 conf/layer.conf                                          | 9 ++++++++-
 ...oss-environment-we-have-to-prepend-the-sysroot-.patch | 0
 .../0002-aisleriot-lib-Makefile.am-fix-configure.patch   | 0
 ...gure.in-fix-configure-with-quadrapassel-disable.patch | 0
 ...04-aisleriot-game.c-fix-build-with-latest-guile.patch | 0
 ...ss-gnuchess-common.h-fix-compile-for-Werror-mis.patch | 0
 .../recipes-games}/gnome-games/gnome-chess_3.24.1.bb     | 0
 .../recipes-games}/gnome-games/gnome-robots_3.22.1.bb    | 0
 .../recipes-games}/gnome-games/libgames-support_1.0.2.bb | 0
 .../gnome-games/libgnome-games-support_1.4.3.bb          | 0
 .../qt5-layer/recipes-games}/freeciv/freeciv-qt5.inc     | 0
 .../qt5-layer/recipes-games}/freeciv/freeciv.inc         | 0
 .../freeciv/freeciv/CacheVarForGettimeofday.patch        | 0
 .../recipes-games}/freeciv/freeciv/allow-root.patch      | 0
 .../freeciv/freeciv/dummy-qtver-S2_6.patch               | 0
 .../recipes-games}/freeciv/freeciv/dummy-qtver.patch     | 0
 .../qt5-layer/recipes-games}/freeciv/freeciv_2.6.6.bb    | 0
 .../qt5-layer/recipes-games}/freeciv/freeciv_3.0.2.bb    | 0
 18 files changed, 8 insertions(+), 1 deletion(-)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/gnome-chess_3.24.1.bb (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/gnome-robots_3.22.1.bb (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/libgames-support_1.0.2.bb (100%)
 rename {recipes-games => dynamic-layers/gnome-layer/recipes-games}/gnome-games/libgnome-games-support_1.4.3.bb (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv-qt5.inc (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv.inc (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv/CacheVarForGettimeofday.patch (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv/allow-root.patch (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv/dummy-qtver-S2_6.patch (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv/dummy-qtver.patch (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv_2.6.6.bb (100%)
 rename {recipes-games => dynamic-layers/qt5-layer/recipes-games}/freeciv/freeciv_3.0.2.bb (100%)
diff mbox series

Patch

diff --git a/conf/layer.conf b/conf/layer.conf
index aa4c39e..3b001f1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,5 +8,12 @@  BBFILE_COLLECTIONS += "games-layer"
 BBFILE_PATTERN_games-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_games-layer = "15"
 
-LAYERDEPENDS_games-layer = "core openembedded-layer filesystems-layer gnome-layer networking-layer multimedia-layer meta-python"
+LAYERDEPENDS_games-layer = "core openembedded-layer filesystems-layer networking-layer multimedia-layer meta-python"
 LAYERSERIES_COMPAT_games-layer = "kirkstone"
+
+BBFILES_DYNAMIC += " \
+	gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/*/*/*.bb \
+	gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/*/*/*.bbappend \
+	qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \
+	qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
+	"
diff --git a/recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch b/dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch
similarity index 100%
rename from recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch
diff --git a/recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch b/dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch
similarity index 100%
rename from recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch
diff --git a/recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch b/dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch
similarity index 100%
rename from recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch
diff --git a/recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch b/dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch
similarity index 100%
rename from recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch
diff --git a/recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch b/dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch
similarity index 100%
rename from recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch
diff --git a/recipes-games/gnome-games/gnome-chess_3.24.1.bb b/dynamic-layers/gnome-layer/recipes-games/gnome-games/gnome-chess_3.24.1.bb
similarity index 100%
rename from recipes-games/gnome-games/gnome-chess_3.24.1.bb
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/gnome-chess_3.24.1.bb
diff --git a/recipes-games/gnome-games/gnome-robots_3.22.1.bb b/dynamic-layers/gnome-layer/recipes-games/gnome-games/gnome-robots_3.22.1.bb
similarity index 100%
rename from recipes-games/gnome-games/gnome-robots_3.22.1.bb
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/gnome-robots_3.22.1.bb
diff --git a/recipes-games/gnome-games/libgames-support_1.0.2.bb b/dynamic-layers/gnome-layer/recipes-games/gnome-games/libgames-support_1.0.2.bb
similarity index 100%
rename from recipes-games/gnome-games/libgames-support_1.0.2.bb
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/libgames-support_1.0.2.bb
diff --git a/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb b/dynamic-layers/gnome-layer/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
similarity index 100%
rename from recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
rename to dynamic-layers/gnome-layer/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
diff --git a/recipes-games/freeciv/freeciv-qt5.inc b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv-qt5.inc
similarity index 100%
rename from recipes-games/freeciv/freeciv-qt5.inc
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv-qt5.inc
diff --git a/recipes-games/freeciv/freeciv.inc b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv.inc
similarity index 100%
rename from recipes-games/freeciv/freeciv.inc
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv.inc
diff --git a/recipes-games/freeciv/freeciv/CacheVarForGettimeofday.patch b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/CacheVarForGettimeofday.patch
similarity index 100%
rename from recipes-games/freeciv/freeciv/CacheVarForGettimeofday.patch
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/CacheVarForGettimeofday.patch
diff --git a/recipes-games/freeciv/freeciv/allow-root.patch b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/allow-root.patch
similarity index 100%
rename from recipes-games/freeciv/freeciv/allow-root.patch
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/allow-root.patch
diff --git a/recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch
similarity index 100%
rename from recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch
diff --git a/recipes-games/freeciv/freeciv/dummy-qtver.patch b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/dummy-qtver.patch
similarity index 100%
rename from recipes-games/freeciv/freeciv/dummy-qtver.patch
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv/dummy-qtver.patch
diff --git a/recipes-games/freeciv/freeciv_2.6.6.bb b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv_2.6.6.bb
similarity index 100%
rename from recipes-games/freeciv/freeciv_2.6.6.bb
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv_2.6.6.bb
diff --git a/recipes-games/freeciv/freeciv_3.0.2.bb b/dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv_3.0.2.bb
similarity index 100%
rename from recipes-games/freeciv/freeciv_3.0.2.bb
rename to dynamic-layers/qt5-layer/recipes-games/freeciv/freeciv_3.0.2.bb