summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/world-broken.inc2
-rw-r--r--meta/conf/multilib.conf1
2 files changed, 0 insertions, 3 deletions
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc
index 76b08d0946..f7c222e6ad 100644
--- a/meta/conf/distro/include/world-broken.inc
+++ b/meta/conf/distro/include/world-broken.inc
@@ -3,5 +3,3 @@
3# 3#
4EXCLUDE_FROM_WORLD_pn-gobject-introspection = "1" 4EXCLUDE_FROM_WORLD_pn-gobject-introspection = "1"
5 5
6# Need bzr
7EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index a23a0eec70..12005894e7 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -126,7 +126,6 @@ BBCLASSEXTEND_append_pn-dtc = " ${MULTILIBS}"
126BBCLASSEXTEND_append_pn-e2fsprogs = " ${MULTILIBS}" 126BBCLASSEXTEND_append_pn-e2fsprogs = " ${MULTILIBS}"
127BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}" 127BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}"
128BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}" 128BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}"
129BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}"
130BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}" 129BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}"
131BBCLASSEXTEND_append_pn-eglibc-initial = " ${MULTILIBS}" 130BBCLASSEXTEND_append_pn-eglibc-initial = " ${MULTILIBS}"
132BBCLASSEXTEND_append_pn-eglibc-locale = " ${MULTILIBS}" 131BBCLASSEXTEND_append_pn-eglibc-locale = " ${MULTILIBS}"