diff options
Diffstat (limited to 'meta/recipes-devtools/systemd-bootchart')
-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/mips64.patch | 35 | ||||
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb (renamed from meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb) | 28 |
6 files changed, 74 insertions, 14 deletions
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/mips64.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/mips64.patch new file mode 100644 index 0000000000..6206bc4b44 --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/mips64.patch @@ -0,0 +1,35 @@ +Recognise mips64 n32/n64 + +These are supported in systemd now a days + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/caf49b95b3a6efe9455078098c729d83b08e5206] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/architecture.h ++++ b/src/architecture.h +@@ -127,13 +127,22 @@ int uname_architecture(void); + # define native_architecture() ARCHITECTURE_SPARC + # define LIB_ARCH_TUPLE "sparc-linux-gnu" + # define PROC_CPUINFO_MODEL "cpu" +-#elif defined(__mips64__) ++#elif defined(__mips64) && defined(__LP64__) + # if __BYTE_ORDER == __BIG_ENDIAN + # define native_architecture() ARCHITECTURE_MIPS64 +-# error "Missing LIB_ARCH_TUPLE for MIPS64" ++# define LIB_ARCH_TUPLE "mips64-linux-gnuabi64" + # else + # define native_architecture() ARCHITECTURE_MIPS64_LE +-# error "Missing LIB_ARCH_TUPLE for MIPS64_LE" ++# define LIB_ARCH_TUPLE "mips64el-linux-gnuabi64" ++# endif ++# define PROC_CPUINFO_MODEL "cpu model" ++#elif defined(__mips64) ++# if __BYTE_ORDER == __BIG_ENDIAN ++# define native_architecture() ARCHITECTURE_MIPS64 ++# define LIB_ARCH_TUPLE "mips64-linux-gnuabin32" ++# else ++# define native_architecture() ARCHITECTURE_MIPS64_LE ++# define LIB_ARCH_TUPLE "mips64el-linux-gnuabin32" + # endif + # define PROC_CPUINFO_MODEL "cpu model" + #elif defined(__mips__) diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch new file mode 100644 index 0000000000..1fdf8dbcc2 --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch @@ -0,0 +1,19 @@ +LTO output is not reproducible. Until it is, disable this. Sadly +there is no configuration option to do so at this time. + +Upstream-Status: Pending [may be accept addition of configuration option?] +RP 2021/3/1 + +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -124,7 +124,7 @@ AS_CASE([$CC], [*clang*], + + AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], + [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ +- -flto -ffat-lto-objects])], ++ ])], + [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) + AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") + diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb index 1ae21b1fbc..25544029d5 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb @@ -1,37 +1,43 @@ -LICENSE = "LGPLv2.1 & GPLv2" +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 \ +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 = " \ +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 \ " -# Modify these as desired -PV = "233+git${SRCPV}" -SRCREV = "fe1c5e41e6bdb78043dad8fa863fc2df66d1dadf" +SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7" S = "${WORKDIR}/git" DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" -inherit pkgconfig autotools systemd distro_features_check +inherit pkgconfig autotools systemd features_check REQUIRED_DISTRO_FEATURES = "systemd" -SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service" +SYSTEMD_SERVICE:${PN} = "systemd-bootchart.service" -do_configure_prepend() { +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" +FILES:${PN} += "${systemd_unitdir}/systemd-bootchart" -EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ +EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ --with-rootlibdir=${base_libdir}" |