re-enable gobject-introspection

In commit f9a285987c5c956d445efeea6c60f258534fe57b, we disabled
gobject-introspection due to a build error as part of the Rocko
transition. However, the only build errors were on qemu, which were
caused by not emulating SSE4.2 (see poky commit
5b2b343453e805be013e721d079bc24de946f28b for details).

Emulate SSE4.2 in qemu and re-enable gobject-introspection.

Bug-AGL: SPEC-1355
Change-Id: I073db2c37623bb8ba6b7809ca0c3bba5213001e2
Signed-off-by: Martin Kelly <mkelly@xevo.com>

diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index 97f6c61..278febd 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -37,8 +37,6 @@ DISTRO_FEATURES_append = " use_eva_pkg"
 #DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib"
 DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
 
-DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " \
        u-boot-script-rcar-gen3 \
 "

diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index f4e731a..b3994b4 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -40,8 +40,6 @@ DISTRO_FEATURES_append = " use_eva_pkg"
 #DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib"
 DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
 
-DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " \
        u-boot-script-rcar-gen3 \
 "

diff --git a/meta-agl-distro/conf/distro/include/x86_64-tune.inc b/meta-agl-distro/conf/distro/include/x86_64-tune.inc
index 023da85..f3bfc37 100644 (file)
--- a/meta-agl-distro/conf/distro/include/x86_64-tune.inc
+++ b/meta-agl-distro/conf/distro/include/x86_64-tune.inc
@@ -19,18 +19,21 @@ TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7"
 BASE_LIB_tune-corei7-32 = "lib"
 TUNE_PKGARCH_tune-corei7-32 = "corei7-32"
 PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32"
+QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false"
 
 AVAILTUNES += "corei7-64"
 TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7"
 BASE_LIB_tune-corei7-64 = "lib64"
 TUNE_PKGARCH_tune-corei7-64 = "corei7-64"
 PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
+QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false"
 
 AVAILTUNES += "corei7-64-x32"
 TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7"
 BASE_LIB_tune-corei7-64-x32 = "libx32"
 TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32"
 PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32"
+QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false"
 
 TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}"
 
@@ -40,6 +43,7 @@ TUNE_FEATURES_tune-qemux86-64 = "${TUNE_FEATURES_tune-x86-64} corei7"
 BASE_LIB_tune-qemux86-64 = "lib64"
 TUNE_PKGARCH_tune-qemux86-64 = "corei7-64"
 PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
+QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false"
 
 # QEMU / runqemu options (partly overrides qemuboot-x86.inc)
 QB_MACHINE = "-machine q35"