diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-05-10 19:17:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:58 +0100 |
commit | 41719e1bfbc969ac0493b1ee81bf24973f5f7d44 (patch) | |
tree | 3144974557147599ccb7b98098ea1fcbee216d95 /meta/recipes-sato/settings-daemon | |
parent | f744f0b18c22daf8bdab837ba8096760b1ce00b8 (diff) | |
download | poky-41719e1bfbc969ac0493b1ee81bf24973f5f7d44.tar.gz |
libowl/settings-daemon/libnotify: add x11 to REQUIRED_DISTRO_FEATURES
The libowl, settings-daemon and libnotify requires gdk/gdkx.h which is
provided by gtk when x11 in DISTRO_FEATURES, so add x11 to
REQUIRED_DISTRO_FEATURES.
The leafpad, settings-daemon and oh-puzzles requires
libowl or settings-daemon, so add xx to REQUIRED_DISTRO_FEATURES for
them too.
The leafpad can't be built without libowl, so depends in directly rather
than use DEPENDS_append_poky.
(From OE-Core rev: 1722ce23075a00e111145cad6daa2ef87ba391fe)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/settings-daemon')
-rw-r--r-- | meta/recipes-sato/settings-daemon/settings-daemon_git.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb index ba48d90773..c0615530af 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb | |||
@@ -17,10 +17,13 @@ SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ | |||
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit autotools pkgconfig gconf | 20 | inherit autotools pkgconfig gconf distro_features_check |
21 | 21 | ||
22 | FILES_${PN} = "${bindir}/* ${sysconfdir}" | 22 | FILES_${PN} = "${bindir}/* ${sysconfdir}" |
23 | 23 | ||
24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES | ||
25 | REQUIRED_DISTRO_FEATURES = "x11" | ||
26 | |||
24 | do_install_append () { | 27 | do_install_append () { |
25 | install -d ${D}/${sysconfdir}/X11/Xsession.d | 28 | install -d ${D}/${sysconfdir}/X11/Xsession.d |
26 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 29 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ |