meta-agl-{bsp,distro}: update kernel configuration for dunfell

Changes:
- Rework CAN qdisc patch application, as it is not required for 5.4
  or newer kernels, this includes adding a linux-agl-4.19.inc for
  BSPs using 4.19.
- Remove linux-agl-4.9.inc and associated patches, as no BSP uses 4.9
  at this point.
- Remove PREFERRED_VERSION_linux-yocto from poky-agl.conf so the
  default 5.4 linux-yocto kernel will be picked up.

Bug-AGL: SPEC-3302

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I9c0eb431661641bd17320a00cdf1ed4e717a9754

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-4.9/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch b/meta-agl-bsp/recipes-kernel/linux/linux-4.9/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch
deleted file mode 100644 (file)
index a1eeac3..0000000
--- a/meta-agl-bsp/recipes-kernel/linux/linux-4.9/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c8bbb0f916de54610513e376070aea531af19dd6 Mon Sep 17 00:00:00 2001
-From: jooseong lee <jooseong.lee@samsung.com>
-Date: Thu, 3 Nov 2016 10:55:43 +0100
-Subject: [PATCH 4/4] Smack: Assign smack_known_web label for kernel thread's
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Assign smack_known_web label for kernel thread's socket in the sk_alloc_security hook
-
-Creating struct sock by sk_alloc function in various kernel subsystems
-like bluetooth dosen't call smack_socket_post_create(). In such case,
-received sock label is the floor('_') label and makes access deny.
-
-Refers-to: https://review.tizen.org/gerrit/#/c/80717/4
-
-Change-Id: I2e5c9359bfede84a988fd4d4d74cdb9dfdfc52d8
-Signed-off-by: jooseong lee <jooseong.lee@samsung.com>
-Signed-off-by: José Bollo <jose.bollo@iot.bzh>
----
- security/smack/smack_lsm.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index cf8a93f..21651bc 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -2321,8 +2321,16 @@ static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags)
-       if (ssp == NULL)
-               return -ENOMEM;
- 
--      ssp->smk_in = skp;
--      ssp->smk_out = skp;
-+      /*
-+       * Sockets created by kernel threads receive web label.
-+       */
-+      if (unlikely(current->flags & PF_KTHREAD)) {
-+              ssp->smk_in = &smack_known_web;
-+              ssp->smk_out = &smack_known_web;
-+      } else {
-+              ssp->smk_in = skp;
-+              ssp->smk_out = skp;
-+      }
-       ssp->smk_packet = NULL;
- 
-       sk->sk_security = ssp;
--- 
-2.7.4
-

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc
index 8521b1d..6d5c670 100644 (file)
--- a/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc
@@ -10,4 +10,5 @@ SRC_URI_append_with-lsm-smack = "\
 
 SRC_URI_append = "\
        file://net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch \
+       file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \
        "

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.19.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.19.inc
new file mode 100644 (file)
index 0000000..da4e0c0
--- /dev/null
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.19.inc
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.19:"
+
+SRC_URI_append = "\
+       file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \
+       "

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.9.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.9.inc
deleted file mode 100644 (file)
index c4ebf4d..0000000
--- a/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.9.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.9:"
-
-#-------------------------------------------------------------------------
-# smack patches for handling bluetooth
-
-SRC_URI_append_with-lsm-smack = "\
-       file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \
-       "

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
index 74dadf6..c03c56e 100644 (file)
--- a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
@@ -2,12 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
 
 DEPENDS += "kern-tools-native"
 
-# canbus qdisc pfifo change
-SRC_URI_append = " file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch"
-
-# bbe target has this upstream patch already
-SRC_URI_remove_bbe = " file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch"
-
 # returns all the elements from the src uri that are .cfg files
 def find_cfgs(d):
     sources=src_patches(d, True)

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index ef0e7f7..639e355 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -103,10 +103,7 @@ DISTRO_FEATURES_APPEND = " "
 DISTRO_FEATURES_remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
 
-# Prefer linux-yocto 4.19 LTS version by default
-PREFERRED_VERSION_linux-yocto = "4.19%"
-
-# Prefer GStreamer 1.14.x by default
+# Prefer GStreamer 1.16.x by default
 PREFERRED_VERSION_gstreamer1.0              ?= "1.16.%"
 PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.16.%"
 PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.%"