aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend3
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux-yocto_3.14%.bbappend3
-rw-r--r--meta-agl/conf/distro/poky-agl.conf14
3 files changed, 11 insertions, 9 deletions
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
index 6b8483e63..6f1ed9bc3 100644
--- a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,8 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
# Extra configuration options for the QEMU kernel
-SRC_URI += "file://0001-fanotify-fix-notification-of-groups-with-inode-mount.patch \
- file://fanotify.cfg \
+SRC_URI += "file://fanotify.cfg \
file://uinput.cfg \
file://hid.cfg \
"
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_3.14%.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_3.14%.bbappend
new file mode 100644
index 000000000..fe9c05c59
--- /dev/null
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_3.14%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+
+SRC_URI += " file://0001-fanotify-fix-notification-of-groups-with-inode-mount.patch"
diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf
index 65248d0bf..b631f8779 100644
--- a/meta-agl/conf/distro/poky-agl.conf
+++ b/meta-agl/conf/distro/poky-agl.conf
@@ -28,13 +28,13 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${AGL_DEF
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemumips ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.14%"
+PREFERRED_VERSION_linux-yocto ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemux86 ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemuarm ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemumips ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemumips64 ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemuppc ?= "4.1%"
# Prefer GStreamer 1.4.x by default
PREFERRED_VERSION_gstreamer1.0 ?= "1.4.%"