summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-06-16 14:38:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 15:52:17 +0100
commit0c6396b74a1348d1d2388ee3a28f41b4e0db23b1 (patch)
treec0a82c019d86212f486fd9397447befd46068163
parent3c2cd780f83b74b86ca0fbf2b628319b0060c94f (diff)
downloadpoky-0c6396b74a1348d1d2388ee3a28f41b4e0db23b1.tar.gz
gnomebase.bbclass: add datadir/icons and datadir/appdata to standard FILES list
Gnome apps seem to increasingly package those, so let's make it common. (From OE-Core rev: fc318fb191b68232cc400db2d5eb543d296ee884) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/gnomebase.bbclass2
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.22.6.bb2
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_3.24.1.bb1
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass
index 54aa45f174..4ccc8e0781 100644
--- a/meta/classes/gnomebase.bbclass
+++ b/meta/classes/gnomebase.bbclass
@@ -14,6 +14,8 @@ FILES_${PN} += "${datadir}/application-registry \
14 ${datadir}/polkit* \ 14 ${datadir}/polkit* \
15 ${datadir}/GConf \ 15 ${datadir}/GConf \
16 ${datadir}/glib-2.0/schemas \ 16 ${datadir}/glib-2.0/schemas \
17 ${datadir}/appdata \
18 ${datadir}/icons \
17" 19"
18 20
19FILES_${PN}-doc += "${datadir}/devhelp" 21FILES_${PN}-doc += "${datadir}/devhelp"
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb b/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
index 651fef1bf0..e9e3493e67 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
@@ -19,5 +19,5 @@ do_configure_prepend() {
19 sed -i -e s:help::g ${S}/Makefile.am 19 sed -i -e s:help::g ${S}/Makefile.am
20} 20}
21 21
22FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers" 22FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
23RDEPENDS_${PN} = "iso-codes adwaita-icon-theme" 23RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
index ca3589bcc9..36093ca89f 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
@@ -30,7 +30,6 @@ PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus"
30 30
31SOLIBS = ".so" 31SOLIBS = ".so"
32FILES_SOLIBSDEV = "" 32FILES_SOLIBSDEV = ""
33FILES_${PN} += "${datadir}/icons/ ${datadir}/appdata"
34 33
35SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}" 34SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}"
36 35