diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-12 16:38:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-12 15:46:34 -0700 |
commit | b2f3ac4d994a1921791f6bd0cdb3591586733694 (patch) | |
tree | db738bf9f5be3a296482d5ea4c7bf9cf8a99180e | |
parent | f2e56f6e0da27c70781e51b5486ca6c731013f1c (diff) | |
download | openembedded-core-b2f3ac4d994a1921791f6bd0cdb3591586733694.tar.gz openembedded-core-b2f3ac4d994a1921791f6bd0cdb3591586733694.tar.bz2 openembedded-core-b2f3ac4d994a1921791f6bd0cdb3591586733694.zip |
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.
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.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 6 |
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 INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "bluetooth" -EXCLUDE_FROM_WORLD = "1" - do_compile_ptest() { oe_runmake buildtests } 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" CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" -# Multiple virtual/gl providers being built breaks staging -EXCLUDE_FROM_WORLD = "1" - # Remove the mesa dependency on mesa-dev, as mesa is empty RDEPENDS_${PN}-dev = "" 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" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 -# A world build should only build the correct version, not all of them. -EXCLUDE_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() { oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts } - - -# There is no reason to build this on its own. -# -EXCLUDE_FROM_WORLD = "1" - |