Merge "af-binder: Upgrade"

diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index cc181dd..534d364 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -11,3 +11,6 @@ INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz"
 # Modify this file under meta-agl-bsp/meta-intel/wic to change the
 # kernel command line, including to change the screen resolution.
 WKS_FILE = "systemd-intel-corei7-64-bootdisk.wks"
+
+PREFERRED_VERSION_linux-intel ?= "4.14%"
+PREFERRED_VERSION_linux-intel-rt ?= "4.14%"

diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend
similarity index 93%
rename from meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend
rename to meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend
index 7f249f2..c49b8ec 100644 (file)
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-require recipes-kernel/linux/linux-agl-4.9.inc
-
 # adding most supported USB Bluetooth, Wifi, and Ethernet devices
 SRC_URI_append = " file://usb-devices.cfg"
 KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/usb-devices.cfg"

diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend
deleted file mode 120000 (symlink)
index 323cbe5..0000000
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-linux-intel_4.9%.bbappend
\ No newline at end of file

diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb b/meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb
index 0d87789..c9d6798 100644 (file)
--- a/meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb
+++ b/meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb
@@ -45,5 +45,6 @@ RDEPENDS_${PN} = "\
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
 RRECOMMENDS_${PN} = "\
+    tzdata \
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
 

diff --git a/templates/feature/agl-all-features/included.dep b/templates/feature/agl-all-features/included.dep
index 70751f3..80717de 100644 (file)
--- a/templates/feature/agl-all-features/included.dep
+++ b/templates/feature/agl-all-features/included.dep
@@ -1 +1 @@
-agl-demo agl-netboot agl-sota agl-sdl
+agl-demo agl-netboot

diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep
index 10ab12b..fdd01e6 100644 (file)
--- a/templates/feature/agl-ci-change-features/included.dep
+++ b/templates/feature/agl-ci-change-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-appfw-smack agl-sdl
+agl-demo agl-devel agl-netboot agl-appfw-smack

diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
index ba9820a..da2a00c 100644 (file)
--- a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-appfw-smack agl-isafw agl-archiver agl-ptest
+agl-devel agl-netboot agl-appfw-smack agl-archiver agl-ptest

diff --git a/templates/feature/agl-ci-snapshot-features/included.dep b/templates/feature/agl-ci-snapshot-features/included.dep
index b09eff0..ab80c2b 100644 (file)
--- a/templates/feature/agl-ci-snapshot-features/included.dep
+++ b/templates/feature/agl-ci-snapshot-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-appfw-smack agl-archiver agl-sdl agl-ptest
+agl-demo agl-devel agl-netboot agl-appfw-smack agl-archiver agl-ptest