From 9e9b9fd332ab259db05578b0ae36b28a2fd8bd92 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 24 Aug 2020 16:30:47 +0800 Subject: linux-intel/5.4: update to v5.4.57 Fix for binutils 2.35 is already merged in 5.4/yocto. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-dev.bb | 1 + recipes-kernel/linux/linux-intel-rt_5.4.bb | 4 +++- recipes-kernel/linux/linux-intel.inc | 1 - recipes-kernel/linux/linux-intel_5.4.bb | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb index c1730005..44c4e9e6 100644 --- a/recipes-kernel/linux/linux-intel-dev.bb +++ b/recipes-kernel/linux/linux-intel-dev.bb @@ -7,6 +7,7 @@ SRC_URI = " \ git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ + file://libtraceevent-fix-build-with-binutils-25.patch \ " SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" diff --git a/recipes-kernel/linux/linux-intel-rt_5.4.bb b/recipes-kernel/linux/linux-intel-rt_5.4.bb index 8ff9d429..50fe1a6d 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.4.bb +++ b/recipes-kernel/linux/linux-intel-rt_5.4.bb @@ -10,7 +10,9 @@ python () { } LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" +SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ + file://libtraceevent-fix-build-with-binutils-25.patch \ +" KBRANCH = "5.4/preempt-rt" KMETA_BRANCH = "yocto-5.4" diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index a592d527..c6163973 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -8,7 +8,6 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n SRC_URI = " \ git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ ${KERNEL_CONFIG_URI} \ - file://libtraceevent-fix-build-with-binutils-25.patch \ " SRC_URI_append = " file://enable_lynxpoint_gpio.cfg" diff --git a/recipes-kernel/linux/linux-intel_5.4.bb b/recipes-kernel/linux/linux-intel_5.4.bb index 5da0f7b2..9975a647 100644 --- a/recipes-kernel/linux/linux-intel_5.4.bb +++ b/recipes-kernel/linux/linux-intel_5.4.bb @@ -9,8 +9,8 @@ SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurs DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "5.4.55" -SRCREV_machine ?= "6f7fd35b3cba7c881c0047df4e747ec45f52b753" +LINUX_VERSION ?= "5.4.57" +SRCREV_machine ?= "eeb611e5394c56d45c5cc8f7dc484c9f19e93143" SRCREV_meta ?= "034cc5c817c601fd1b4f128a1f9d885a8537f073" # For Crystalforest and Romley -- cgit v1.2.3-54-g00ecf