summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-12-21 19:10:10 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-12-22 05:47:06 +0000
commit4cf3fb4ab2856ebedff16afefbb107145b8b923d (patch)
treea8c4d0338de0efa31fc0109a688a58577e8c3051
parent1c3c06842ac1b9c089d0a08e91c60f44e4844fac (diff)
Ignore BSP IMAGE_FSTYPES changes
Add anonymous python snippet in agl-image-minimal.inc to reset the value of IMAGE_FSTYPES to AGL_DEFAULT_IMAGE_FSTYPES plus AGL_EXTRA_IMAGE_FSTYPES (i.e. the value defined in poky-agl.conf). This is a very big hammer, but at present seems the best way to avoid the build time/space costs from BSP appends adding extra types that are not required. Bug-AGL: SPEC-3741 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Idad57d0371ae59058b2b1acffbeae85db97aa91d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25846
-rw-r--r--meta-agl-core/recipes-platform/images/agl-image-minimal.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal.inc b/meta-agl-core/recipes-platform/images/agl-image-minimal.inc
index 825393978..185a00258 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-minimal.inc
+++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.inc
@@ -2,9 +2,11 @@ IMAGE_LINGUAS = " "
inherit core-image
+python __anonymous () {
+ d.setVar("IMAGE_FSTYPES", d.getVar("AGL_DEFAULT_IMAGE_FSTYPES"))
+ d.appendVar("IMAGE_FSTYPES", " " + d.getVar("AGL_EXTRA_IMAGE_FSTYPES"))
+}
+
IMAGE_INSTALL = "${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_ROOTFS_SIZE ?= "8192"
-
-# Allow extra IMAGE_FSTYPES to be added by boards configs
-IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}"
#fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
From a4943bb5c7fdf5eb297223d2c3bb02d2271bea48 Mon Sep 17 00:00:00 2001
From: Risto Avila <risto.avila@theqtcompany.com>
Date: Thu, 17 Dec 2015 04:22:53 +0200
Subject: [PATCH] Force qdbus to make introspect for every findMetaObject

---
 src/dbus/qdbusintegrator.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index cce8b9c..ae2a9dc 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -2512,8 +2512,11 @@ QDBusConnectionPrivate::findMetaObject(const QString &service, const QString &pa
     if (!interface.isEmpty()) {
         QDBusReadLocker locker(FindMetaObject1Action, this);
         QDBusMetaObject *mo = cachedMetaObjects.value(interface, 0);
-        if (mo)
-            return mo;
+        if (mo) {
+            // service is not unique. Remove cached object to force introspect
+            cachedMetaObjects.remove(interface);
+            delete mo;
+        }
     }
 
     // introspect the target object
-- 
1.9.1