Merge remote-tracking branch 'agl/next'

* agl/next:
  meta-agl-bsp: Add CONFIG_LSM workaround for 5.1+ kernels
  meta-agl-profile-cluster-qt5: disable qtbase patches
  zeus updates for dragonboard-410c
  meta-security: activates dbus-cynagora
  recipes-graphics/wayland/weston: Expose weston_output_damage()
  meta-agl-profile-core: tweak udisks2 configuration for AGL
  meta-agl-bsp/meta-arago: update weston bbappend
  [RCAR] Update rcar driver weston 7 bsp 3.21.0
  [RCAR] Update rcar driver weston 7 bsp 3.21.0
  [RCAR] Split ADSP path for ulcb and ulcb-kf
  Fix nss-localuser post install
  meta-agl-bsp: meta-raspberrypi: handle zeus upgrade
  meta-agl-profile-core: add patch for systemd-udevd SECLABEL crash
  meta-security: disable dbus-cynara patches
  meta-agl-bsp: handle ptest-runner upgrade
  meta-agl-distro: Add inc file for next branch over-rides
  meta-agl-distro: BBMASK problematic upstream meta-security bbappend
  meta-agl-distro: prefer linux-yocto 4.19 LTS kernel
  meta-agl-profile-graphical-qt5: enable qt5location services
  meta-agl-profile-core: update most recipe
  meta-agl-profile-core: update neardal recipe
  Update base local.conf.sample
  meta-agl-profile-graphical: don't always build agl-compositor
  meta-agl-profile-graphical: update weston and weston-init
  meta-agl-profile-graphical: update wayland-ivi-extension for weston 7.0.0
  meta-agl-distro: add polkit to DISTRO_FEATURES
  meta-agl-profile-core: update fontconfig bbappend
  meta-agl-profile-core: switch to udisks2
  meta-security: handle systemd upgrade
  meta-agl-profile-graphical-qt5: handle qtwayland upgrade
  meta-agl-profile-core: handle freetype upgrade
  meta-agl-bsp meta-agl-profile-core: upgrade to opencv 4.x
  meta-agl-profile-core: update rtl-sdr recipe for zeus
  meta-security meta-app-framework: handle xmlsec1 upgrade
  meta-agl-profile-graphical: upgrade to gstreamer 1.16
  meta-agl-profile-core: remove libmicrohttpd backport
  meta-agl-profile-core: remove backported curl and nghttp2 recipes
  meta-agl-profile-core: remove libnfc recipe
  meta-agl-profile-core: remove connman backport
  meta-agl-profile-graphical: remove weston 5.0.0 patches
  meta-agl-profile-core: remove old glibc patch
  meta-agl-bsp/meta-intel: remove linux-firmware_git.bbappend
  meta-agl-bsp: remove weston and wayland-protocols backports
  meta-app-framework: remove libzip recipe
  meta-security: remove keyutils recipe
  Declare layer compatibility with zeus

Change-Id: Ie8ee1e37958279e7cf2d503c54ffacb46ba0c31c

5 files changed, 35 insertions, 25 deletions

diff --git a/meta-agl-profile-core/recipes-core/glibc/.appends.core b/meta-agl-profile-core/recipes-core/glibc/.appends.core
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl-profile-core/recipes-core/glibc/.appends.core
+++ /dev/null
diff --git a/meta-agl-profile-core/recipes-core/glibc/glibc/arm/local-arm-futex.diff b/meta-agl-profile-core/recipes-core/glibc/glibc/arm/local-arm-futex.diff
deleted file mode 100644
index 27d1144d0..000000000
--- a/meta-agl-profile-core/recipes-core/glibc/glibc/arm/local-arm-futex.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Lie about futex_atomic_cmpxchg_inatomic kernel support.
- In past versions of glibc, we incorrectly assumed all ARM kernels
- in all configurations supported futex_atomic_cmpxchg_inatomic. This
- was clearly a lie, however it was a lie that we relied on, because
- the fallback implementation appears to not play nicely with certain
- applications like pulseaudio.  Restore the lie for kernels > 2.6.32
- and plug our ears and scream "LA LA LA" about how wrong this is.
-Author: Adam Conrad <adconrad@ubuntu.com>
-Bug-Ubuntu: https://launchpad.net/bugs/1436162
-Bug-Debian: https://bugs.debian.org/788799
-Last-Update: 2015-03-25
-
---- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
-+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
-@@ -22,7 +22,7 @@
- /* The ARM kernel before 3.14.3 may or may not support
-    futex_atomic_cmpxchg_inatomic, depending on kernel
-    configuration.  */
--#if __LINUX_KERNEL_VERSION < 0x030E03
-+#if __LINUX_KERNEL_VERSION < 0x020620
- # undef __ASSUME_SET_ROBUST_LIST
- #endif
diff --git a/meta-agl-profile-core/recipes-core/glibc/glibc_2.2%.bbappend b/meta-agl-profile-core/recipes-core/glibc/glibc_2.2%.bbappend
deleted file mode 100644
index 0868a2c7d..000000000
--- a/meta-agl-profile-core/recipes-core/glibc/glibc_2.2%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append_arm = " file://arm/local-arm-futex.diff "
diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch b/meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch
new file mode 100644
index 000000000..29165b58e
--- /dev/null
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch
@@ -0,0 +1,34 @@
+Fix udevd SECLABEL token parsing
+
+The udevd rules parsing rewrite in v243 broke SECLABEL parsing,
+with the result being that udevd crashes when it parses a line
+containing a SECLABEL token. Fix the handling of the attribute
+of SECLABEL tokens when parsing, and add a check to prevent
+crashes if the attribute is missing.
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
+diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
+index efea16e5c5..3e757ccb06 100644
+--- a/src/udev/udev-rules.c
++++ b/src/udev/udev-rules.c
+@@ -918,7 +918,7 @@ static int parse_token(UdevRules *rules, const char *key, char *attr, UdevRuleOp
+                         op = OP_ASSIGN;
+                 }
+ 
+-                r = rule_line_add_token(rule_line, TK_A_SECLABEL, op, value, NULL);
++                r = rule_line_add_token(rule_line, TK_A_SECLABEL, op, value, attr);
+         } else if (streq(key, "RUN")) {
+                 if (is_match || op == OP_REMOVE)
+                         return log_token_invalid_op(rules, key);
+@@ -1927,6 +1927,8 @@ static int udev_rule_apply_token_to_event(
+                 _cleanup_free_ char *name = NULL, *label = NULL;
+                 char label_str[UTIL_LINE_SIZE] = {};
+ 
++                if (!token->data)
++                        break;
+                 name = strdup((const char*) token->data);
+                 if (!name)
+                         return log_oom();
diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
index 2d1427366..d77bf7bf1 100644
--- a/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
@@ -1,6 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "\
+    file://0001-fix-udevd-seclabel-parsing.patch \
     file://e2fsck.conf \
     file://canbus-can.network \
     ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','file://wired.network','',d)} \