diff options
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 3 | ||||
| -rw-r--r-- | meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend (renamed from meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend) | 2 | ||||
| l--------- | meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend | 1 | ||||
| -rw-r--r-- | meta-agl/recipes-core/packagegroups/packagegroup-core-boot-agl.bb | 1 | ||||
| -rw-r--r-- | templates/feature/agl-all-features/included.dep | 2 | ||||
| -rw-r--r-- | templates/feature/agl-ci-change-features/included.dep | 2 | ||||
| -rw-r--r-- | templates/feature/agl-ci-snapshot-features-nogfx/included.dep | 2 | ||||
| -rw-r--r-- | templates/feature/agl-ci-snapshot-features/included.dep | 2 |
8 files changed, 8 insertions, 7 deletions
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 cc181ddaa..534d36475 100644 --- 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 index 7f249f207..c49b8ecb0 100644 --- 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 index 323cbe55a..000000000 --- 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 0d877896f..c9d679879 100644 --- 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 70751f350..80717ded0 100644 --- 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 10ab12bb3..fdd01e6a8 100644 --- 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 ba9820a46..da2a00c09 100644 --- 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 b09eff04b..ab80c2b06 100644 --- 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 |