diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2024-01-02 14:09:47 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-07 12:24:54 +0000 |
| commit | 1f6dfaedcc01071b7ec17a411264f39c327e4dc0 (patch) | |
| tree | d9f1d9b85b09f37ccebae1fc6556ec4c87a4ccca /meta/recipes-devtools/systemd-bootchart | |
| parent | 2076e830de2846dd0dfeba86637e575ced85aa54 (diff) | |
| download | openembedded-core-1f6dfaedcc01071b7ec17a411264f39c327e4dc0.tar.gz | |
systemd-bootchart: upgrade from 234 to 235
0001-architecture-Recognise-RISCV-32-RISCV-64.patch is dropped because
it has some problem. It's a patch from systemd repo, yet it's marked
as 'Backport' for systemd-bootchart. systemd and systemd-bootchart are
two different projects. Now in 235, RISCV64 has been officially supported,
but RISCV32 is not. So drop this patch. People who want RISCV32 support
need to work with systemd-bootchart upstream first.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/systemd-bootchart')
| -rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb (renamed from meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb) | 5 |
2 files changed, 2 insertions, 48 deletions
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch deleted file mode 100644 index fc03812bb9..0000000000 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4a6ace0a965965ea15e88c3418c7158ca5cc9f8f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Nov 2019 10:12:05 -0800 -Subject: [PATCH] architecture: Recognise RISCV-32/RISCV-64 - -Upstream-Status: Backport [https://github.com/systemd/systemd/commit/171b53380085b1288b03b19a2b978f36a5c003d0] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/architecture.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/src/architecture.h b/src/architecture.h -index 26679e2..89c7d32 100644 ---- a/src/architecture.h -+++ b/src/architecture.h -@@ -57,6 +57,8 @@ enum { - ARCHITECTURE_M68K, - ARCHITECTURE_TILEGX, - ARCHITECTURE_CRIS, -+ ARCHITECTURE_RISCV32, -+ ARCHITECTURE_RISCV64, - _ARCHITECTURE_MAX, - _ARCHITECTURE_INVALID = -1 - }; -@@ -194,6 +196,17 @@ int uname_architecture(void); - #elif defined(__cris__) - # define native_architecture() ARCHITECTURE_CRIS - # error "Missing LIB_ARCH_TUPLE for CRIS" -+#elif defined(__riscv) -+# if __SIZEOF_POINTER__ == 4 -+# define native_architecture() ARCHITECTURE_RISCV32 -+# define LIB_ARCH_TUPLE "riscv32-linux-gnu" -+# elif __SIZEOF_POINTER__ == 8 -+# define native_architecture() ARCHITECTURE_RISCV64 -+# define LIB_ARCH_TUPLE "riscv64-linux-gnu" -+# else -+# error "Unrecognized riscv architecture variant" -+# endif -+# define PROC_CPUINFO_MODEL "cpu model" - #else - # error "Please register your architecture here!" - #endif --- -2.24.0 - diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb index bc3eee2093..25544029d5 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb @@ -8,8 +8,7 @@ LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=master \ - file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \ +SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=main \ file://mips64.patch \ file://no_lto.patch \ " @@ -21,7 +20,7 @@ SRC_URI:append:libc-musl = " \ " -SRCREV = "8183cfd9dad8beca5434d625cf6b2df87775e956" +SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7" S = "${WORKDIR}/git" |