diff options
| author | Naveen Saini <naveen.kumar.saini@intel.com> | 2020-09-09 16:49:49 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-09-09 22:45:32 +0800 |
| commit | 059166879397fea8fe6689f53c7434003b81e742 (patch) | |
| tree | fdadf449aa35994409c8c257844885363a9b0a6c | |
| parent | 121c436eef8c687f11395f3498f30311d3af1b7f (diff) | |
| download | meta-intel-059166879397fea8fe6689f53c7434003b81e742.tar.gz | |
linux-intel-rt/5.4: update to v5.4.59
Updates -rt patchset to -rt36.
Dropped ed the binutils 2.35 fix patch which is already
merged in 5.4/preempt-rt.
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
| -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 () { | |||
| 11 | 11 | ||
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
| 13 | SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | 13 | SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ |
| 14 | file://libtraceevent-fix-build-with-binutils-25.patch \ | ||
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | KBRANCH = "5.4/preempt-rt" | 16 | KBRANCH = "5.4/preempt-rt" |
| @@ -19,9 +18,9 @@ KMETA_BRANCH = "yocto-5.4" | |||
| 19 | 18 | ||
| 20 | DEPENDS += "elfutils-native openssl-native util-linux-native" | 19 | DEPENDS += "elfutils-native openssl-native util-linux-native" |
| 21 | 20 | ||
| 22 | LINUX_VERSION ?= "5.4.52" | 21 | LINUX_VERSION ?= "5.4.59" |
| 23 | SRCREV_machine ?= "67fed51a39242ade744c1c72aced7d395c57e8d9" | 22 | SRCREV_machine ?= "3747758c5c6c5b1b210e88c4bdb62e09c033c192" |
| 24 | SRCREV_meta ?= "4aeda12f7f7eb84613ae1fe6e22cd9cd9790c20b" | 23 | SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" |
| 25 | 24 | ||
| 26 | LINUX_KERNEL_TYPE = "preempt-rt" | 25 | LINUX_KERNEL_TYPE = "preempt-rt" |
| 27 | 26 | ||
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 @@ | |||
| 1 | From 1fe4ee7f680c3f69f620d68a5d2f7341e8db693b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ben Hutchings <ben@decadent.org.uk> | ||
| 3 | Date: Sat, 25 Jul 2020 02:06:23 +0100 | ||
| 4 | Subject: libtraceevent: Fix build with binutils 2.35 | ||
| 5 | |||
| 6 | In binutils 2.35, 'nm -D' changed to show symbol versions along with | ||
| 7 | symbol names, with the usual @@ separator. When generating | ||
| 8 | libtraceevent-dynamic-list we need just the names, so strip off the | ||
| 9 | version suffix if present. | ||
| 10 | |||
| 11 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | ||
| 12 | Tested-by: Salvatore Bonaccorso <carnil@debian.org> | ||
| 13 | Reviewed-by: Steven Rostedt <rostedt@goodmis.org> | ||
| 14 | Cc: linux-trace-devel@vger.kernel.org | ||
| 15 | Cc: stable@vger.kernel.org | ||
| 16 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://github.com/torvalds/linux/commit/39efdd94e314336f4acbac4c07e0f37bdc3bef71] | ||
| 19 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 20 | --- | ||
| 21 | tools/lib/traceevent/plugins/Makefile | 2 +- | ||
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 23 | |||
| 24 | diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile | ||
| 25 | index f440989fa55e..23c3535bcbd6 100644 | ||
| 26 | --- a/tools/lib/traceevent/plugins/Makefile | ||
| 27 | +++ b/tools/lib/traceevent/plugins/Makefile | ||
| 28 | @@ -196,7 +196,7 @@ define do_generate_dynamic_list_file | ||
| 29 | xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ | ||
| 30 | if [ "$$symbol_type" = "U W" ];then \ | ||
| 31 | (echo '{'; \ | ||
| 32 | - $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ | ||
| 33 | + $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\ | ||
| 34 | echo '};'; \ | ||
| 35 | ) > $2; \ | ||
| 36 | else \ | ||
| 37 | -- | ||
| 38 | cgit v1.2.2-1-g5e49 | ||
| 39 | |||
