From 8ea90fd103048fecf3c5be7d7d1e415dd79c4332 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 2 Jan 2024 14:09:47 +0800 Subject: 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. (From OE-Core rev: 1f6dfaedcc01071b7ec17a411264f39c327e4dc0) Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...-architecture-Recognise-RISCV-32-RISCV-64.patch | 45 ---------------------- .../systemd-bootchart/systemd-bootchart_234.bb | 44 --------------------- .../systemd-bootchart/systemd-bootchart_235.bb | 43 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch delete mode 100644 meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb create mode 100644 meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb 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 -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 ---- - 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_234.bb deleted file mode 100644 index bc3eee2093..0000000000 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Boot performance graphing tool" -DESCRIPTION = "For systemd-bootchart, several proc debug interfaces are required in the kernel config: \ - CONFIG_SCHEDSTATS \ -below is optional, for additional info: \ - CONFIG_SCHED_DEBUG" -HOMEPAGE = "https://github.com/systemd/systemd-bootchart" -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 \ - file://mips64.patch \ - file://no_lto.patch \ -" - -SRC_URI:append:libc-musl = " \ - file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ - file://0002-musl-does-not-provide-printf-h.patch \ - file://0003-musl-does-not-provide-canonicalize_file_name.patch \ - " - - -SRCREV = "8183cfd9dad8beca5434d625cf6b2df87775e956" - -S = "${WORKDIR}/git" - -DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" - -inherit pkgconfig autotools systemd features_check - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE:${PN} = "systemd-bootchart.service" - -do_configure:prepend() { - # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot - rm -f ${S}/m4/intltool.m4 -} - -FILES:${PN} += "${systemd_unitdir}/systemd-bootchart" - -EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ - --with-rootlibdir=${base_libdir}" diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb new file mode 100644 index 0000000000..25544029d5 --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb @@ -0,0 +1,43 @@ +SUMMARY = "Boot performance graphing tool" +DESCRIPTION = "For systemd-bootchart, several proc debug interfaces are required in the kernel config: \ + CONFIG_SCHEDSTATS \ +below is optional, for additional info: \ + CONFIG_SCHED_DEBUG" +HOMEPAGE = "https://github.com/systemd/systemd-bootchart" +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=main \ + file://mips64.patch \ + file://no_lto.patch \ +" + +SRC_URI:append:libc-musl = " \ + file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ + file://0002-musl-does-not-provide-printf-h.patch \ + file://0003-musl-does-not-provide-canonicalize_file_name.patch \ + " + + +SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7" + +S = "${WORKDIR}/git" + +DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" + +inherit pkgconfig autotools systemd features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE:${PN} = "systemd-bootchart.service" + +do_configure:prepend() { + # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot + rm -f ${S}/m4/intltool.m4 +} + +FILES:${PN} += "${systemd_unitdir}/systemd-bootchart" + +EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ + --with-rootlibdir=${base_libdir}" -- cgit v1.2.3-54-g00ecf