diff options
| -rw-r--r-- | recipes-kernel/linux/linux-intel-rt_5.4.bb | 7 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch | 39 |
2 files changed, 3 insertions, 43 deletions
diff --git a/recipes-kernel/linux/linux-intel-rt_5.4.bb b/recipes-kernel/linux/linux-intel-rt_5.4.bb index dc890ce6..a8970645 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.4.bb +++ b/recipes-kernel/linux/linux-intel-rt_5.4.bb @@ -11,7 +11,6 @@ python () { LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 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" @@ -19,9 +18,9 @@ KMETA_BRANCH = "yocto-5.4" DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "5.4.52" -SRCREV_machine ?= "67fed51a39242ade744c1c72aced7d395c57e8d9" -SRCREV_meta ?= "4aeda12f7f7eb84613ae1fe6e22cd9cd9790c20b" +LINUX_VERSION ?= "5.4.59" +SRCREV_machine ?= "3747758c5c6c5b1b210e88c4bdb62e09c033c192" +SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch b/recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch deleted file mode 100644 index 66cb981e..00000000 --- a/recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1fe4ee7f680c3f69f620d68a5d2f7341e8db693b Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sat, 25 Jul 2020 02:06:23 +0100 -Subject: libtraceevent: Fix build with binutils 2.35 - -In binutils 2.35, 'nm -D' changed to show symbol versions along with -symbol names, with the usual @@ separator. When generating -libtraceevent-dynamic-list we need just the names, so strip off the -version suffix if present. - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Tested-by: Salvatore Bonaccorso <carnil@debian.org> -Reviewed-by: Steven Rostedt <rostedt@goodmis.org> -Cc: linux-trace-devel@vger.kernel.org -Cc: stable@vger.kernel.org -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> - -Upstream-Status: Backport [https://github.com/torvalds/linux/commit/39efdd94e314336f4acbac4c07e0f37bdc3bef71] -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - tools/lib/traceevent/plugins/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile -index f440989fa55e..23c3535bcbd6 100644 ---- a/tools/lib/traceevent/plugins/Makefile -+++ b/tools/lib/traceevent/plugins/Makefile -@@ -196,7 +196,7 @@ define do_generate_dynamic_list_file - xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ - if [ "$$symbol_type" = "U W" ];then \ - (echo '{'; \ -- $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ -+ $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\ - echo '};'; \ - ) > $2; \ - else \ --- -cgit v1.2.2-1-g5e49 - |