Merge branch 'next'

* next:
  Temporary workarounds for h3ulcb and bbe
  [RCAR] use omx-user-module as libomxil provider
  meta-agl-bsp: dra7xx-evm/beaglebone updates for dunfell
  meta-agl-bsp: remove obsolete linux-fslc-imx bbappend
  meta-agl-profile-graphical-qt5: remove Chromium specific bits from SDK
  meta-agl-profile-graphical: disable memfd usage in weston
  meta-agl-bsp: update raspberrypi configuration for dunfell
  meta-agl-{bsp,distro}: update kernel configuration for dunfell
  meta-agl-profile-core: update psplash for dunfell
  meta-agl-profile-core: update systemd for dunfell
  meta-app-framework: set DISTRO_FEATURES_NATIVE
  meta-agl-profile-core: update bluez5 for dunfell
  meta-agl-profile-graphical: update weston for dunfell
  meta-agl-profile-graphical: update wayland-ivi-extension for dunfell
  meta-agl-profile-graphical: update wayland for dunfell
  meta-agl-profile-core: update pulseaudio for dunfell
  meta-security: update to audit 2.8.5
  Update distro_features_check usage
  meta-agl-bsp: remove vboxguestdrivers recipe
  Declare layer compatibility for dunfell

Change-Id: I879ad3040ed6f2fca3f21d189ccce7f1614013b5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

5 files changed, 16 insertions, 71 deletions

diff --git a/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim b/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim
deleted file mode 100755
index ac9bf674a..000000000
--- a/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim
+++ /dev/null
@@ -1,11 +0,0 @@
-#/bin/bash
-
-psplash-default "$@" &
-sleep .2
-while :; do
-	for x in 0 1 2 3 4 5 6 7 8 9 10 -9 -8 -7 -6 -5 -4 -3 -2 -1 0 -1 -2 -3 -4 -5 -6 -7 -8 -9 10 9 8 7 6 5 4 3 2 1; do
-		psplash-write "PROGRESS ${x}0" || exit 0
-		psplash-write "MSG $(journalctl -n1 -ocat)" || exit 0
-		sleep .1
-	done
-done
diff --git a/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service b/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service
deleted file mode 100644
index 14bd4994b..000000000
--- a/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Terminate Psplash Boot Screen
-After=psplash-start.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/psplash-write QUIT
-TimeoutSec=20
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service b/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service
deleted file mode 100644
index d3b6940d0..000000000
--- a/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Start Psplash Boot Screen
-Wants=systemd-vconsole-setup.service
-After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
-DefaultDependencies=no
-
-[Service]
-ExecStartPre=/bin/sh -c "if [ -e /sys/class/graphics/fbcon/cursor_blink ]; then echo 0 > /sys/class/graphics/fbcon/cursor_blink; fi"
-ExecStart=/bin/bash -c "/usr/bin/psplash-anim -n -a 90"
-
-[Install]
-WantedBy=sysinit.target
diff --git a/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend b/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend
index bdc196b6f..5a82fc872 100644
--- a/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend
+++ b/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend
@@ -1,27 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += "file://psplash-colors.h \
-            file://psplash-start.service \
-            file://psplash-quit.service \
-            file://psplash-anim \
-            "
+SRC_URI += "file://psplash-colors.h"
 
 SPLASH_IMAGES="file://psplash-poky-img.h;outsuffix=default"
 
-inherit systemd
-
-SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${PN}', '', d)}"
-SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'psplash-start.service psplash-quit.service', '', d)}"
-
 do_configure_append () {
-	cd ${S}
-	cp ../psplash-colors.h ./
-}
-
-do_install_append () {
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/*.service ${D}/${systemd_unitdir}/system
-    fi
-    install -m 755 ${WORKDIR}/psplash-anim ${D}/${bindir}
+	cp -f ${WORKDIR}/psplash-colors.h ${S}
 }
diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd/0002-network-add-CAN-Termination-tristate-option.patch b/meta-agl-profile-core/recipes-core/systemd/systemd/0002-network-add-CAN-Termination-tristate-option.patch
index e2002bb5f..feaff2736 100644
--- a/meta-agl-profile-core/recipes-core/systemd/systemd/0002-network-add-CAN-Termination-tristate-option.patch
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd/0002-network-add-CAN-Termination-tristate-option.patch
@@ -15,10 +15,10 @@ Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
  6 files changed, 18 insertions(+)
 
 diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
-index de9b8b21ab..69ca675a8d 100644
+index a55460f034..96e211dcf0 100644
 --- a/src/libsystemd/sd-netlink/netlink-types.c
 +++ b/src/libsystemd/sd-netlink/netlink-types.c
-@@ -310,6 +310,7 @@ static const NLType rtnl_link_info_data_can_types[] = {
+@@ -316,6 +316,7 @@ static const NLType rtnl_link_info_data_can_types[] = {
          [IFLA_CAN_BITTIMING]            = { .size = sizeof(struct can_bittiming) },
          [IFLA_CAN_RESTART_MS]           = { .type = NETLINK_TYPE_U32 },
          [IFLA_CAN_CTRLMODE]             = { .size = sizeof(struct can_ctrlmode) },
@@ -58,34 +58,34 @@ index 5755df57bd..3abe8ae2ed 100644
          if (r < 0)
                  return log_link_error_errno(link, r, "Failed to close netlink container: %m");
 diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
-index d4d108ad25..f6814c2213 100644
+index f7e68be181..b3df4f3960 100644
 --- a/src/network/networkd-network-gperf.gperf
 +++ b/src/network/networkd-network-gperf.gperf
-@@ -227,6 +227,7 @@ CAN.BitRate,                            config_parse_si_size,
+@@ -245,6 +245,7 @@ CAN.BitRate,                            config_parse_si_size,
  CAN.SamplePoint,                        config_parse_permille,                           0,                             offsetof(Network, can_sample_point)
  CAN.RestartSec,                         config_parse_sec,                                0,                             offsetof(Network, can_restart_us)
  CAN.TripleSampling,                     config_parse_tristate,                           0,                             offsetof(Network, can_triple_sampling)
 +CAN.Termination,                        config_parse_tristate,                           0,                             offsetof(Network, can_termination)
- /* backwards compatibility: do not add new entries to this section */
- Network.IPv4LL,                         config_parse_ipv4ll,                             0,                             offsetof(Network, link_local)
- DHCP.ClientIdentifier,                  config_parse_dhcp_client_identifier,             0,                             offsetof(Network, dhcp_client_identifier)
+ TrafficControlQueueingDiscipline.Parent,                             config_parse_tc_qdiscs_parent,                     0,                             0
+ TrafficControlQueueingDiscipline.NetworkEmulatorDelaySec,            config_parse_tc_network_emulator_delay,            0,                             0
+ TrafficControlQueueingDiscipline.NetworkEmulatorDelayJitterSec,      config_parse_tc_network_emulator_delay,            0,                             0
 diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
-index 2b8d0eb2fb..00f309b738 100644
+index 6e443975f1..0ea5c05db7 100644
 --- a/src/network/networkd-network.c
 +++ b/src/network/networkd-network.c
-@@ -436,6 +436,7 @@ int network_load_one(Manager *manager, const char *filename) {
+@@ -448,6 +448,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
                  .keep_configuration = _KEEP_CONFIGURATION_INVALID,
  
                  .can_triple_sampling = -1,
 +                .can_termination = -1,
+                 .ip_service_type = -1,
          };
  
-         r = config_parse_many(filename, NETWORK_DIRS, dropin_dirname,
 diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
-index bc760744e5..ed803ee746 100644
+index aa74bb4ae7..6a1f094156 100644
 --- a/src/network/networkd-network.h
 +++ b/src/network/networkd-network.h
-@@ -170,6 +170,7 @@ struct Network {
+@@ -193,6 +193,7 @@ struct Network {
          unsigned can_sample_point;
          usec_t can_restart_us;
          int can_triple_sampling;
@@ -94,10 +94,10 @@ index bc760744e5..ed803ee746 100644
          AddressFamily ip_forward;
          bool ip_masquerade;
 diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
-index 848d4bd187..66a7557f29 100644
+index 5bd80dece8..781269d960 100644
 --- a/test/fuzz/fuzz-network-parser/directives.network
 +++ b/test/fuzz/fuzz-network-parser/directives.network
-@@ -183,6 +183,7 @@ SamplePoint=
+@@ -194,6 +194,7 @@ SamplePoint=
  BitRate=
  RestartSec=
  TripleSampling=
@@ -105,6 +105,3 @@ index 848d4bd187..66a7557f29 100644
  [Address]
  DuplicateAddressDetection=
  AutoJoin=
--- 
-2.25.0
-