summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-12 16:38:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 06:27:19 -0700
commita5c274b4511636870d1955d79b0eb2e94a966597 (patch)
tree4527cb937d0a5f8f337282e516aaae11423f1ea2
parent960b58eae324bc61c0763b336be10df24c00c7a1 (diff)
downloadpoky-a5c274b4511636870d1955d79b0eb2e94a966597.tar.gz
meta: remove some EXCLUDE_FROM_WORLD assignments
Now that we have recipe-specific-sysroots we don't need to exclude recipes from world builds because they conflict with other recipes, as they'll all be built with their own sysroots. (From OE-Core rev: b2f3ac4d994a1921791f6bd0cdb3591586733694) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc3
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc4
-rw-r--r--meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb6
4 files changed, 0 insertions, 15 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index a73d9568e5..ae2a833c0c 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -136,8 +136,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'bluet
136INITSCRIPT_PACKAGES = "${PN}" 136INITSCRIPT_PACKAGES = "${PN}"
137INITSCRIPT_NAME_${PN} = "bluetooth" 137INITSCRIPT_NAME_${PN} = "bluetooth"
138 138
139EXCLUDE_FROM_WORLD = "1"
140
141do_compile_ptest() { 139do_compile_ptest() {
142 oe_runmake buildtests 140 oe_runmake buildtests
143} 141}
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 88ba0050d5..23ae651f7d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -99,9 +99,6 @@ FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
99 99
100CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" 100CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
101 101
102# Multiple virtual/gl providers being built breaks staging
103EXCLUDE_FROM_WORLD = "1"
104
105# Remove the mesa dependency on mesa-dev, as mesa is empty 102# Remove the mesa dependency on mesa-dev, as mesa is empty
106RDEPENDS_${PN}-dev = "" 103RDEPENDS_${PN}-dev = ""
107 104
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index b04eafbdf2..4af40ab8a1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -35,7 +35,3 @@ PACKAGES =+ "${PN}-xcb"
35FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" 35FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
36FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" 36FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
37FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" 37FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
38
39# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
40# A world build should only build the correct version, not all of them.
41EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index 889878ddc0..d63701e5a0 100644
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -24,9 +24,3 @@ do_configure() {
24 oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ 24 oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
25 -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts 25 -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts
26} 26}
27
28
29# There is no reason to build this on its own.
30#
31EXCLUDE_FROM_WORLD = "1"
32