diff options
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/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb (renamed from meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb) | 9 |
5 files changed, 7 insertions, 53 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/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch index f392ceafcc..812900051a 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch @@ -12,8 +12,8 @@ systemd/0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch Based on work by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +Upstream-Status: Denied [https://github.com/systemd/systemd-bootchart/pull/47] --- -Upstream-Status: Pending src/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch index 196272f7a2..2fac76a549 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch @@ -10,8 +10,8 @@ Original patch author: Emil Renner Berthing <systemd@esmil.dk> Includes work by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +Upstream-Status: Denied [https://github.com/systemd/systemd-bootchart/pull/47] --- -Upstream-Status: Pending Makefile.am | 4 + configure.ac | 3 + diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch index 7670d95f07..fbe9c93d2d 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch @@ -9,8 +9,8 @@ systemd/0007-check-for-missing-canonicalize_file_name.patch Based on work by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +Upstream-Status: Denied [https://github.com/systemd/systemd-bootchart/pull/47] --- -Upstream-Status: Pending src/path-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb index 30dbbcc05c..25544029d5 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb @@ -4,12 +4,11 @@ DESCRIPTION = "For systemd-bootchart, several proc debug interfaces are required below is optional, for additional info: \ CONFIG_SCHED_DEBUG" HOMEPAGE = "https://github.com/systemd/systemd-bootchart" -LICENSE = "LGPLv2.1 & GPLv2" +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 \ - 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" @@ -38,7 +37,7 @@ do_configure:prepend() { rm -f ${S}/m4/intltool.m4 } -FILES:${PN} += "${systemd_system_unitdir}d-bootchart" +FILES:${PN} += "${systemd_unitdir}/systemd-bootchart" EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ --with-rootlibdir=${base_libdir}" |