diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/systemd-bootchart')
3 files changed, 84 insertions, 2 deletions
diff --git a/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch b/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch new file mode 100644 index 00000000..fc03812b --- /dev/null +++ b/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch @@ -0,0 +1,45 @@ +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/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/mips64.patch b/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/mips64.patch new file mode 100644 index 00000000..6206bc4b --- /dev/null +++ b/external/poky/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/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb index 1ae21b1f..a7a1f0ff 100644 --- a/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ b/external/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb @@ -3,6 +3,8 @@ 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 \ + file://mips64.patch \ " SRC_URI_append_libc-musl = " \ @@ -20,7 +22,7 @@ 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" @@ -33,5 +35,5 @@ do_configure_prepend() { FILES_${PN} += "${systemd_unitdir}/systemd-bootchart" -EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ +EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ --with-rootlibdir=${base_libdir}" |