diff options
| -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 | |||
| 136 | INITSCRIPT_PACKAGES = "${PN}" | 136 | INITSCRIPT_PACKAGES = "${PN}" |
| 137 | INITSCRIPT_NAME_${PN} = "bluetooth" | 137 | INITSCRIPT_NAME_${PN} = "bluetooth" |
| 138 | 138 | ||
| 139 | EXCLUDE_FROM_WORLD = "1" | ||
| 140 | |||
| 141 | do_compile_ptest() { | 139 | do_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 | ||
| 100 | CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" | 100 | CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" |
| 101 | 101 | ||
| 102 | # Multiple virtual/gl providers being built breaks staging | ||
| 103 | EXCLUDE_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 |
| 106 | RDEPENDS_${PN}-dev = "" | 103 | RDEPENDS_${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" | |||
| 35 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" | 35 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" |
| 36 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" | 36 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" |
| 37 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | 37 | FILES_${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. | ||
| 41 | 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() { | |||
| 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 | # | ||
| 31 | EXCLUDE_FROM_WORLD = "1" | ||
| 32 | |||
