summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-27 00:05:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 17:52:24 +0100
commitceb960d499cc71ba3e1dd144bd22bb0794639ba1 (patch)
treecce2c31ad9de0d92c723cfd5014cd0d855b838bc
parentc0358417d82c7cf74c1e277ec8321bbd6d849396 (diff)
downloadopenembedded-core-contrib-ceb960d499cc71ba3e1dd144bd22bb0794639ba1.tar.gz
openembedded-core-contrib-ceb960d499cc71ba3e1dd144bd22bb0794639ba1.tar.bz2
openembedded-core-contrib-ceb960d499cc71ba3e1dd144bd22bb0794639ba1.zip
puzzles: Use Gtk+3 by default
Also split the puzzles into two packages (just like the old oh-puzzles). Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb18
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 346f43bc9c..a9daacdaf2 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -23,16 +23,28 @@ S = "${WORKDIR}/git"
inherit autotools-brokensep distro_features_check pkgconfig
-PACKAGECONFIG ??= "gtk2"
+PACKAGECONFIG ??= "gtk3"
PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
+PACKAGES += "${PN}-extra"
+FILES_${PN} = ""
+FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
+
+python __anonymous () {
+ var = bb.data.expand("FILES_${PN}", d, 1)
+ data = d.getVar(var, True)
+ for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
+ data = data + " ${prefix}/bin/%s" % name
+ data = data + " ${datadir}/applications/%s.desktop" % name
+ d.setVar(var, data)
+}
+
+
do_configure_prepend () {
./mkfiles.pl
}
-FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*"
-
do_install () {
rm -rf ${D}/*
export prefix=${D}