Merge "Merge branch 'sandbox/ronan/rocko_kf'"

diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index 93ef834..cb4edb4 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -31,8 +31,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"
-
 IMAGE_INSTALL_append_rcar-gen3 = " \
        kernel-devicetree \
        kernel-module-pvrsrvkm \

diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 7887324..46c6f1f 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -33,8 +33,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"
-
 IMAGE_INSTALL_append_rcar-gen3 = " \
        kernel-devicetree \
        kernel-module-pvrsrvkm \

diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/most/most.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/most/most.bbappend
deleted file mode 100644 (file)
index 6b4444a..0000000
--- a/meta-agl-bsp/meta-qcom/recipes-kernel/most/most.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI_remove = " \
-           file://0001-src-most-net-add-skb_put_data-function.patch \
-          "

diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtual.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtual.cfg
index 776f295..25a8fae 100644 (file)
--- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtual.cfg
+++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtual.cfg
@@ -1,10 +1,11 @@
 [output]
 name=Virtual-1
-#mode=1920x1080
+transform=270
+mode=1920x1080
 #mode=1600x1200
 #mode=1680x1050
 #mode=1400x1050
-mode=1600x900
+#mode=1600x900
 #mode=1280x1024
 #mode=1440x900
 #mode=1280x960

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"

diff --git a/meta-agl/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/meta-agl/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
new file mode 100644 (file)
index 0000000..6379ec3
--- /dev/null
+++ b/meta-agl/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Bluetooth Audio ALSA Backend"
+HOMEPAGE = "https://github.com/Arkq/bluez-alsa"
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3e99e80c5d718213f35ae1def4c106"
+
+SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master"
+SRCREV = "9045edb436ea755f395a2e09e4525b5defad286a"
+
+SRC_URI += "file://bluez-alsa.service"
+
+S  = "${WORKDIR}/git"
+
+DEPENDS += "alsa-lib bluez5 systemd glib-2.0 sbc"
+
+PACKAGECONFIG[aac]  = "--enable-aac, --disable-aac, "
+PACKAGECONFIG[aptx] = "--enable-aptx,--disable-aptx,"
+PACKAGECONFIG[hcitop]   = "--enable-hcitop,  --disable-hcitop,  libbsd ncurses"
+
+inherit autotools pkgconfig
+inherit systemd
+
+SYSTEMD_AUTO_ENABLE = "enable"
+SYSTEMD_SERVICE_${PN} = "bluez-alsa.service"
+
+PACKAGECONFIG += "hcitop"
+
+do_install_append () {
+    install -d ${D}${base_libdir}/systemd/system
+    install -m 0644 ${WORKDIR}/bluez-alsa.service ${D}${base_libdir}/systemd/system
+}
+
+FILES_${PN} += "\
+  ${datadir}/alsa/alsa.conf.d/20-bluealsa.conf\
+  ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.so\
+  ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.so\
+"

diff --git a/meta-agl/recipes-connectivity/bluez-alsa/files/bluez-alsa.service b/meta-agl/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
new file mode 100644 (file)
index 0000000..671815e
--- /dev/null
+++ b/meta-agl/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Bluetooth Audio ALSA Backend
+After=bluetooth.service
+Requires=bluetooth.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/bluealsa
+
+[Install]
+WantedBy=multi-user.target

diff --git a/meta-app-framework/recipes-apps/low-level-can-service/low-level-can-service_git.bb b/meta-app-framework/recipes-apps/agl-service-can-low-level/agl-service-can-low-level_git.bb
similarity index 100%
rename from meta-app-framework/recipes-apps/low-level-can-service/low-level-can-service_git.bb
rename to meta-app-framework/recipes-apps/agl-service-can-low-level/agl-service-can-low-level_git.bb

diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
index 48123c0..09fb6fd 100644 (file)
--- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
+++ b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}"
 
-SRCREV = "bd10bc4405f3777fe495cb9f62818d67ab584854"
+SRCREV = "5b26086e8e634d1fcd2e65dc164fd3453f43942b"
 PV = "${AGL_BRANCH}+git${SRCPV}"
 
 S = "${WORKDIR}/git"

diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch
new file mode 100644 (file)
index 0000000..185ed8f
--- /dev/null
+++ b/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch
@@ -0,0 +1,11 @@
+diff --git a/examples/verify3.c b/examples/verify3.c
+index 2d26ae7..d36552d 100644
+--- a/examples/verify3.c
++++ b/examples/verify3.c
+@@ -1,4 +1,4 @@
+-4/** 
++/** 
+  * XML Security Library example: Verifying a file signed with X509 certificate
+  *
+  * Verifies a file signed with X509 certificate. 
+

diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend b/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend
new file mode 100644 (file)
index 0000000..047ab40
--- /dev/null
+++ b/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI += "file://remove-4-in-verify3.patch"
+

diff --git a/templates/base/00_local.conf.agl.inc b/templates/base/00_local.conf.agl.inc
index 1128b32..1cfd905 100644 (file)
--- a/templates/base/00_local.conf.agl.inc
+++ b/templates/base/00_local.conf.agl.inc
@@ -6,6 +6,3 @@ DISTRO = "poky-agl"
 
 #see meta-agl/meta-agl/conf/include/base-agl.inc
 require conf/include/base-agl.inc
-
-# Temporarily disable GObject Introspection Data
-GI_DATA_ENABLED = "False"

diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
index dd64eda..7510b45 100644 (file)
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ b/templates/feature/agl-sota/50_bblayers.conf.inc
@@ -1,5 +1,6 @@
 BBLAYERS =+ " \
        ${METADIR}/meta-updater \
+       ${METADIR}/meta-updater-qemux86-64 \
        ${METADIR}/meta-openembedded/meta-filesystems \
        ${METADIR}/meta-openembedded/meta-python \
        "