diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-05-10 19:30:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:58 +0100 |
commit | 12d02d58e76d055144550b2bf487789e077dec15 (patch) | |
tree | dd07f26da8587531cdfee3f7a743f33dd2026ce4 | |
parent | 3a0a27f5af71f37c100a07dfe439fee8b462b668 (diff) | |
download | poky-12d02d58e76d055144550b2bf487789e077dec15.tar.gz |
recipes-sato: add x11 to REQUIRED_DISTRO_FEATURES
They can't be built withou x11 in DISTRO_FEATURES.
(From OE-Core rev: fa1d9b518708103b0b2e259aa78f8dd694cfc0d6)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10 files changed, 41 insertions, 9 deletions
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb index 29b472a933..318d2e0809 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb | |||
@@ -19,4 +19,7 @@ EXTRA_OECONF = "--enable-startup-notification --with-dbus" | |||
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit autotools pkgconfig | 22 | inherit autotools pkgconfig distro_features_check |
23 | |||
24 | # The startup-notification requires x11 in DISTRO_FEATURES | ||
25 | REQUIRED_DISTRO_FEATURES = "x11" | ||
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index 7a99a9c46a..0d321d3992 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | |||
@@ -20,7 +20,10 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ | |||
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit autotools pkgconfig gettext gtk-immodules-cache | 23 | inherit autotools pkgconfig gettext gtk-immodules-cache distro_features_check |
24 | |||
25 | # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES | ||
26 | REQUIRED_DISTRO_FEATURES = "x11" | ||
24 | 27 | ||
25 | EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" | 28 | EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" |
26 | 29 | ||
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb index 490e2bc86b..4ed7368fd0 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | |||
@@ -11,6 +11,9 @@ DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" | |||
11 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" | 11 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" |
12 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" | 12 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" |
13 | 13 | ||
14 | # The startup-notification requires x11 in DISTRO_FEATURES | ||
15 | REQUIRED_DISTRO_FEATURES = "x11" | ||
16 | |||
14 | SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" | 17 | SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" |
15 | PV = "2.0+git${SRCPV}" | 18 | PV = "2.0+git${SRCPV}" |
16 | 19 | ||
@@ -33,4 +36,4 @@ FILES_${PN} += "${libdir}/matchbox-panel/*.so \ | |||
33 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" | 36 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" |
34 | FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" | 37 | FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" |
35 | 38 | ||
36 | inherit autotools pkgconfig | 39 | inherit autotools pkgconfig distro_features_check |
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index fe84a0fc99..76de18ae93 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | |||
@@ -14,6 +14,11 @@ PR = "r30" | |||
14 | # based on the machine architecture. | 14 | # based on the machine architecture. |
15 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 15 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
16 | 16 | ||
17 | inherit distro_features_check | ||
18 | |||
19 | # The matchbox-theme-sato requires x11 in DISTRO_FEATURES | ||
20 | REQUIRED_DISTRO_FEATURES = "x11" | ||
21 | |||
17 | SRC_URI = "file://session" | 22 | SRC_URI = "file://session" |
18 | S = "${WORKDIR}" | 23 | S = "${WORKDIR}" |
19 | 24 | ||
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc index b0f8380f56..d947e1ab0f 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc | |||
@@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4" | |||
8 | DEPENDS = "matchbox-wm" | 8 | DEPENDS = "matchbox-wm" |
9 | SECTION = "x11/wm" | 9 | SECTION = "x11/wm" |
10 | 10 | ||
11 | inherit autotools pkgconfig | 11 | inherit autotools pkgconfig distro_features_check |
12 | 12 | ||
13 | FILES_${PN} += "${datadir}/themes" | 13 | FILES_${PN} += "${datadir}/themes" |
14 | |||
15 | # The matchbox-wm requires x11 in DISTRO_FEATURES | ||
16 | REQUIRED_DISTRO_FEATURES = "x11" | ||
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb index 3aabdd4385..5cc42cbc50 100644 --- a/meta/recipes-sato/midori/midori_0.5.8.bb +++ b/meta/recipes-sato/midori/midori_0.5.8.bb | |||
@@ -12,7 +12,10 @@ SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751 | |||
12 | # MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. | 12 | # MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. |
13 | COMPATIBLE_HOST_mips64n32 = "null" | 13 | COMPATIBLE_HOST_mips64n32 = "null" |
14 | 14 | ||
15 | inherit gtk-icon-cache pkgconfig vala pythonnative cmake | 15 | inherit gtk-icon-cache pkgconfig vala pythonnative cmake distro_features_check |
16 | |||
17 | # The webkit-gtk and libxscrnsaver requires x11 in DISTRO_FEATURES | ||
18 | REQUIRED_DISTRO_FEATURES = "x11" | ||
16 | 19 | ||
17 | EXTRA_OECMAKE = " \ | 20 | EXTRA_OECMAKE = " \ |
18 | -DCMAKE_INSTALL_PREFIX=${prefix} \ | 21 | -DCMAKE_INSTALL_PREFIX=${prefix} \ |
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb index 14f58ae68f..6ef0347af7 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb | |||
@@ -23,7 +23,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ | |||
23 | SRC_URI[md5sum] = "c993402d407b0a3fc076f842ac1bc5c9" | 23 | SRC_URI[md5sum] = "c993402d407b0a3fc076f842ac1bc5c9" |
24 | SRC_URI[sha256sum] = "cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380" | 24 | SRC_URI[sha256sum] = "cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380" |
25 | 25 | ||
26 | inherit autotools pkgconfig | 26 | inherit autotools pkgconfig distro_features_check |
27 | |||
28 | # The startup-notification requires x11 in DISTRO_FEATURES | ||
29 | REQUIRED_DISTRO_FEATURES = "x11" | ||
27 | 30 | ||
28 | do_install_append () { | 31 | do_install_append () { |
29 | install -d ${D}/${datadir} | 32 | install -d ${D}/${datadir} |
diff --git a/meta/recipes-sato/puzzles/puzzles_r10116.bb b/meta/recipes-sato/puzzles/puzzles_r10116.bb index 3bc2c85bb1..1ad8d1bf14 100644 --- a/meta/recipes-sato/puzzles/puzzles_r10116.bb +++ b/meta/recipes-sato/puzzles/puzzles_r10116.bb | |||
@@ -4,6 +4,9 @@ HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" | |||
4 | DEPENDS = "gtk+ libxt" | 4 | DEPENDS = "gtk+ libxt" |
5 | MOD_PV = "${@d.getVar('PV',1)[1:]}" | 5 | MOD_PV = "${@d.getVar('PV',1)[1:]}" |
6 | 6 | ||
7 | # The libxt requires x11 in DISTRO_FEATURES | ||
8 | REQUIRED_DISTRO_FEATURES = "x11" | ||
9 | |||
7 | LICENSE = "MIT" | 10 | LICENSE = "MIT" |
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" | 11 | LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" |
9 | 12 | ||
@@ -14,7 +17,7 @@ SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ | |||
14 | 17 | ||
15 | S = "${WORKDIR}/${BPN}" | 18 | S = "${WORKDIR}/${BPN}" |
16 | 19 | ||
17 | inherit autotools-brokensep | 20 | inherit autotools-brokensep distro_features_check |
18 | 21 | ||
19 | do_configure_prepend () { | 22 | do_configure_prepend () { |
20 | ./mkfiles.pl | 23 | ./mkfiles.pl |
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb index a079e03d97..8794032d25 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "git://git.yoctoproject.org/screenshot" | |||
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | inherit autotools pkgconfig | 19 | inherit autotools pkgconfig distro_features_check |
20 | 20 | ||
21 | FILES_${PN} += "${libdir}/matchbox-panel/*.so" | 21 | FILES_${PN} += "${libdir}/matchbox-panel/*.so" |
22 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" | 22 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" |
@@ -24,3 +24,6 @@ FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" | |||
24 | do_install_append () { | 24 | do_install_append () { |
25 | rm ${D}${libdir}/matchbox-panel/*.la | 25 | rm ${D}${libdir}/matchbox-panel/*.la |
26 | } | 26 | } |
27 | |||
28 | # The matchbox-panel-2 requires x11 in DISTRO_FEATURES | ||
29 | REQUIRED_DISTRO_FEATURES = "x11" | ||
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb index 3f19c2d204..334870292e 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | |||
@@ -17,6 +17,9 @@ DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnut | |||
17 | gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" | 17 | gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" |
18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | 18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" |
19 | 19 | ||
20 | # The libxt requires x11 in DISTRO_FEATURES | ||
21 | REQUIRED_DISTRO_FEATURES = "x11" | ||
22 | |||
20 | SRC_URI = "\ | 23 | SRC_URI = "\ |
21 | http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ | 24 | http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ |
22 | file://nodolt.patch \ | 25 | file://nodolt.patch \ |
@@ -35,7 +38,7 @@ SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a7 | |||
35 | # webkit-gtk can NOT be built on MIPS64 with n32 ABI | 38 | # webkit-gtk can NOT be built on MIPS64 with n32 ABI |
36 | COMPATIBLE_HOST_mips64n32 = "null" | 39 | COMPATIBLE_HOST_mips64n32 = "null" |
37 | 40 | ||
38 | inherit autotools lib_package gtk-doc pkgconfig | 41 | inherit autotools lib_package gtk-doc pkgconfig distro_features_check |
39 | 42 | ||
40 | S = "${WORKDIR}/webkit-${PV}/" | 43 | S = "${WORKDIR}/webkit-${PV}/" |
41 | 44 | ||