diff options
Diffstat (limited to 'meta/recipes-kernel/systemtap')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap-native_5.3.bb (renamed from meta/recipes-kernel/systemtap/systemtap-native_git.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb | 40 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch | 11 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch | 15 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch | 36 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch | 61 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch | 44 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_5.3.bb (renamed from meta/recipes-kernel/systemtap/systemtap_git.bb) | 47 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 13 |
9 files changed, 144 insertions, 128 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.3.bb index 19cc1cf0f0..8befa7a7ea 100644 --- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-native_5.3.bb | |||
@@ -1,6 +1,5 @@ | |||
1 | require systemtap_${PV}.bb | ||
1 | 2 | ||
2 | require systemtap_git.bb | 3 | inherit_defer native |
3 | |||
4 | inherit native | ||
5 | 4 | ||
6 | addtask addto_recipe_sysroot after do_populate_sysroot before do_build | 5 | addtask addto_recipe_sysroot after do_populate_sysroot before do_build |
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb deleted file mode 100644 index 46820ef489..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | SUMMARY = "UProbes kernel module for SystemTap" | ||
2 | |||
3 | require systemtap_git.inc | ||
4 | |||
5 | DEPENDS = "systemtap virtual/kernel" | ||
6 | |||
7 | # On systems without CONFIG_UTRACE, this package is empty. | ||
8 | ALLOW_EMPTY_${PN} = "1" | ||
9 | |||
10 | inherit module-base gettext | ||
11 | |||
12 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:" | ||
13 | |||
14 | FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" | ||
15 | |||
16 | # Compile and install the uprobes kernel module on machines with utrace | ||
17 | # support. Note that staprun expects it in the systemtap/runtime directory, | ||
18 | # not in /lib/modules. | ||
19 | do_compile() { | ||
20 | if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_BUILDDIR}/.config | ||
21 | then | ||
22 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP | ||
23 | oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | ||
24 | AR="${KERNEL_AR}" \ | ||
25 | -C ${STAGING_KERNEL_DIR} scripts | ||
26 | oe_runmake KDIR=${STAGING_KERNEL_DIR} \ | ||
27 | M="${S}/runtime/uprobes/" \ | ||
28 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | ||
29 | AR="${KERNEL_AR}" \ | ||
30 | -C "${S}/runtime/uprobes/" | ||
31 | fi | ||
32 | } | ||
33 | |||
34 | do_install() { | ||
35 | if [ -e "${S}/runtime/uprobes/uprobes.ko" ] | ||
36 | then | ||
37 | install -d ${D}${datadir}/systemtap/runtime/uprobes/ | ||
38 | install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}${datadir}/systemtap/runtime/uprobes/ | ||
39 | fi | ||
40 | } | ||
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch index 48cf4aee85..ee9baedcda 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2ada22f05460223924efe54080cb4419e2b4c276 Mon Sep 17 00:00:00 2001 | 1 | From 18d088d10c1a0885fa25ac40591e38c8aa545c81 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 24 Feb 2017 17:53:02 +0200 | 3 | Date: Fri, 24 Feb 2017 17:53:02 +0200 |
4 | Subject: [PATCH] Install python modules to correct library dir. | 4 | Subject: [PATCH] Install python modules to correct library dir. |
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
19 | 1 file changed, 6 insertions(+), 2 deletions(-) | 19 | 1 file changed, 6 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/python/Makefile.am b/python/Makefile.am | 21 | diff --git a/python/Makefile.am b/python/Makefile.am |
22 | index a254480..578602f 100644 | 22 | index 13618dc2f..9d5cb7bcb 100644 |
23 | --- a/python/Makefile.am | 23 | --- a/python/Makefile.am |
24 | +++ b/python/Makefile.am | 24 | +++ b/python/Makefile.am |
25 | @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = subdir-objects | 25 | @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = subdir-objects |
@@ -35,7 +35,7 @@ index a254480..578602f 100644 | |||
35 | pkglibexecpython_PYTHON = | 35 | pkglibexecpython_PYTHON = |
36 | @@ -47,7 +51,7 @@ install-exec-local: | 36 | @@ -47,7 +51,7 @@ install-exec-local: |
37 | if HAVE_PYTHON2_PROBES | 37 | if HAVE_PYTHON2_PROBES |
38 | (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \ | 38 | (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \ |
39 | --build-base $(shell readlink -f $(builddir))/py2build \ | 39 | --build-base $(shell readlink -f $(builddir))/py2build \ |
40 | - install --prefix $(DESTDIR)$(prefix) \ | 40 | - install --prefix $(DESTDIR)$(prefix) \ |
41 | + install --root $(DESTDIR) --prefix $(prefix) --prefix $(prefix) --install-lib=${pythondir} \ | 41 | + install --root $(DESTDIR) --prefix $(prefix) --prefix $(prefix) --install-lib=${pythondir} \ |
@@ -44,13 +44,10 @@ index a254480..578602f 100644 | |||
44 | --verbose) | 44 | --verbose) |
45 | @@ -55,7 +59,7 @@ endif | 45 | @@ -55,7 +59,7 @@ endif |
46 | if HAVE_PYTHON3_PROBES | 46 | if HAVE_PYTHON3_PROBES |
47 | (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \ | 47 | (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \ |
48 | --build-base $(shell readlink -f $(builddir))/py3build \ | 48 | --build-base $(shell readlink -f $(builddir))/py3build \ |
49 | - install --prefix $(DESTDIR)$(prefix) \ | 49 | - install --prefix $(DESTDIR)$(prefix) \ |
50 | + install --root $(DESTDIR) --prefix $(prefix) --install-lib=${python3dir} \ | 50 | + install --root $(DESTDIR) --prefix $(prefix) --install-lib=${python3dir} \ |
51 | --single-version-externally-managed \ | 51 | --single-version-externally-managed \ |
52 | --record $(shell readlink -f $(builddir))/py3build/install_files.txt \ | 52 | --record $(shell readlink -f $(builddir))/py3build/install_files.txt \ |
53 | --verbose) | 53 | --verbose) |
54 | -- | ||
55 | 2.7.4 | ||
56 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch index 15a6f2a9a5..7d35f76b29 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch | |||
@@ -13,19 +13,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
13 | stringtable.h | 2 +- | 13 | stringtable.h | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/stringtable.h b/stringtable.h | 16 | Index: git/stringtable.h |
17 | index 5fc42e7..6fd8a1e 100644 | 17 | =================================================================== |
18 | --- a/stringtable.h | 18 | --- git.orig/stringtable.h |
19 | +++ b/stringtable.h | 19 | +++ git/stringtable.h |
20 | @@ -19,7 +19,7 @@ | 20 | @@ -23,7 +23,7 @@ |
21 | 21 | ||
22 | #if defined(HAVE_BOOST_UTILITY_STRING_REF_HPP) | 22 | #if 0 && defined(HAVE_BOOST_UTILITY_STRING_REF_HPP) |
23 | #include <boost/version.hpp> | 23 | #include <boost/version.hpp> |
24 | -#include <boost/utility/string_ref.hpp> //header with string_ref | 24 | -#include <boost/utility/string_ref.hpp> //header with string_ref |
25 | +#include "@RELATIVE_STAGING_INCDIR@/boost/utility/string_ref.hpp" //header with string_ref | 25 | +#include "@RELATIVE_STAGING_INCDIR@/boost/utility/string_ref.hpp" //header with string_ref |
26 | 26 | ||
27 | // XXX: experimental tunables | 27 | // XXX: experimental tunables |
28 | #define INTERNED_STRING_FIND_MEMMEM 1 /* perf stat indicates a very slight benefit */ | 28 | #define INTERNED_STRING_FIND_MEMMEM 1 /* perf stat indicates a very slight benefit */ |
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch b/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch new file mode 100644 index 0000000000..dacd19edd1 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 71e4ffd46dbbb7de1d06edb66f3e1fe0de423586 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 21 May 2025 13:25:46 +0200 | ||
4 | Subject: [PATCH] python/Makefile.am: use absolute path for source directory | ||
5 | includes as well | ||
6 | |||
7 | Otherwise it would be relative to the build directory, | ||
8 | which works only if the build and source directory are in the | ||
9 | same parent directory, and breaks if they're on different levels. | ||
10 | |||
11 | Upstream-Status: Submitted [by email to fche@redhat.com,wcohen@redhat.com,systemtap@sourceware.org] | ||
12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
13 | --- | ||
14 | python/Makefile.am | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/python/Makefile.am b/python/Makefile.am | ||
18 | index 9d5cb7bcb..130e90b24 100644 | ||
19 | --- a/python/Makefile.am | ||
20 | +++ b/python/Makefile.am | ||
21 | @@ -2,10 +2,10 @@ | ||
22 | |||
23 | AUTOMAKE_OPTIONS = subdir-objects | ||
24 | |||
25 | -# Note that we have to use 'abs_builddir' here since we change | ||
26 | +# Note that we have to use absolute directores here since we change | ||
27 | # directories back to the source directory when building the python | ||
28 | # extension. | ||
29 | -AM_CPPFLAGS = -I$(srcdir)/../includes | ||
30 | +AM_CPPFLAGS = -I$(abs_srcdir)/../includes | ||
31 | AM_CPPFLAGS += -I$(abs_builddir)/../includes/sys | ||
32 | |||
33 | # Add OE's CFLAGS which contains `-fdebug-prefix-map' options to | ||
34 | -- | ||
35 | 2.39.5 | ||
36 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch new file mode 100644 index 0000000000..1decf21593 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From 191f528da19193d713d94ee252e2485efd9af4d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 25 Oct 2021 17:59:24 +0200 | ||
4 | Subject: [PATCH] staprun: address ncurses 6.3 failures | ||
5 | |||
6 | Upstream-Status: Submitted [by email to smakarov@redhat.com,systemtap@sourceware.org] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | staprun/monitor.c | 24 ++++++++++++------------ | ||
10 | 1 file changed, 12 insertions(+), 12 deletions(-) | ||
11 | |||
12 | diff --git a/staprun/monitor.c b/staprun/monitor.c | ||
13 | index 478634c09..f4fbfd686 100644 | ||
14 | --- a/staprun/monitor.c | ||
15 | +++ b/staprun/monitor.c | ||
16 | @@ -448,12 +448,12 @@ void monitor_render(void) | ||
17 | if (active_window == 0) | ||
18 | wattron(status, A_BOLD); | ||
19 | wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", | ||
20 | - width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), | ||
21 | - width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), | ||
22 | - width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), | ||
23 | - width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), | ||
24 | - width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), | ||
25 | - width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), | ||
26 | + (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), | ||
27 | + (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), | ||
28 | + (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), | ||
29 | + (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), | ||
30 | + (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), | ||
31 | + (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), | ||
32 | HIGHLIGHT("name", p_name, comp_fn_index)); | ||
33 | if (active_window == 0) | ||
34 | wattroff(status, A_BOLD); | ||
35 | @@ -466,17 +466,17 @@ void monitor_render(void) | ||
36 | json_object *probe, *field; | ||
37 | probe = json_object_array_get_idx(jso_probe_list, i); | ||
38 | json_object_object_get_ex(probe, "index", &field); | ||
39 | - wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); | ||
40 | + wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field)); | ||
41 | json_object_object_get_ex(probe, "state", &field); | ||
42 | - wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); | ||
43 | + wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field)); | ||
44 | json_object_object_get_ex(probe, "hits", &field); | ||
45 | - wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); | ||
46 | + wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field)); | ||
47 | json_object_object_get_ex(probe, "min", &field); | ||
48 | - wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); | ||
49 | + wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field)); | ||
50 | json_object_object_get_ex(probe, "avg", &field); | ||
51 | - wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); | ||
52 | + wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field)); | ||
53 | json_object_object_get_ex(probe, "max", &field); | ||
54 | - wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); | ||
55 | + wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field)); | ||
56 | getyx(status, discard, cur_x); | ||
57 | json_object_object_get_ex(probe, "name", &field); | ||
58 | wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); | ||
59 | -- | ||
60 | 2.20.1 | ||
61 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch b/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch deleted file mode 100644 index efc79f6c0f..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Fri, 18 Dec 2020 13:15:08 -0500 | ||
4 | Subject: [PATCH] transport: protect include and callsite with same conditional | ||
5 | |||
6 | transport.c has the following code block: | ||
7 | |||
8 | if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS)) | ||
9 | |||
10 | Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS. | ||
11 | |||
12 | linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and | ||
13 | must be included or we have a compilation issue. | ||
14 | |||
15 | The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM, | ||
16 | which means that in some configurations we can get out of sync with | ||
17 | the include and the callsite. | ||
18 | |||
19 | If we protect the include and the callsite with the same #ifdef, we can | ||
20 | be sure that they will be consistent. | ||
21 | |||
22 | Upstream-status: Inappropriate (kernel-devsrc specific) | ||
23 | |||
24 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
25 | --- | ||
26 | runtime/transport/transport.c | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c | ||
30 | index bb4a98bd3..88e20ea28 100644 | ||
31 | --- a/runtime/transport/transport.c | ||
32 | +++ b/runtime/transport/transport.c | ||
33 | @@ -21,7 +21,7 @@ | ||
34 | #include <linux/namei.h> | ||
35 | #include <linux/delay.h> | ||
36 | #include <linux/mutex.h> | ||
37 | -#ifdef CONFIG_SECURITY_LOCKDOWN_LSM | ||
38 | +#ifdef STAPCONF_LOCKDOWN_DEBUGFS | ||
39 | #include <linux/security.h> | ||
40 | #endif | ||
41 | #include "../uidgid_compatibility.h" | ||
42 | -- | ||
43 | 2.19.1 | ||
44 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_5.3.bb index 923d64b975..588b3b8d36 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_5.3.bb | |||
@@ -1,9 +1,16 @@ | |||
1 | SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Linux" | 1 | SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Linux" |
2 | DESCRIPTION = "It provides free software infrastructure to simplify the \ | ||
3 | gathering of information about the running Linux system. This assists \ | ||
4 | diagnosis of a performance or functional problem." | ||
2 | HOMEPAGE = "https://sourceware.org/systemtap/" | 5 | HOMEPAGE = "https://sourceware.org/systemtap/" |
3 | 6 | ||
4 | require systemtap_git.inc | 7 | require systemtap_git.inc |
5 | 8 | ||
6 | SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch" | 9 | SRC_URI += " \ |
10 | file://0001-improve-reproducibility-for-c-compiling.patch \ | ||
11 | file://0001-staprun-address-ncurses-6.3-failures.patch \ | ||
12 | file://0001-python-Makefile.am-use-absolute-path-for-source-dire.patch \ | ||
13 | " | ||
7 | 14 | ||
8 | DEPENDS = "elfutils" | 15 | DEPENDS = "elfutils" |
9 | 16 | ||
@@ -11,6 +18,7 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ | |||
11 | --without-nss --without-avahi --without-dyninst \ | 18 | --without-nss --without-avahi --without-dyninst \ |
12 | --disable-server --disable-grapher --enable-prologues \ | 19 | --disable-server --disable-grapher --enable-prologues \ |
13 | --with-python3 --without-python2-probes \ | 20 | --with-python3 --without-python2-probes \ |
21 | --with-extra-version="oe" \ | ||
14 | ac_cv_prog_have_javac=no \ | 22 | ac_cv_prog_have_javac=no \ |
15 | ac_cv_prog_have_jar=no " | 23 | ac_cv_prog_have_jar=no " |
16 | 24 | ||
@@ -18,58 +26,59 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs" | |||
18 | 26 | ||
19 | EXTRA_OECONF += "${STAP_DOCS} " | 27 | EXTRA_OECONF += "${STAP_DOCS} " |
20 | 28 | ||
21 | PACKAGECONFIG ??= "translator sqlite monitor python3-probes" | 29 | PACKAGECONFIG ??= "translator sqlite monitor python3-probes ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" |
22 | PACKAGECONFIG[translator] = "--enable-translator,--disable-translator,boost,bash" | 30 | PACKAGECONFIG[translator] = "--enable-translator,--disable-translator,boost,bash" |
23 | PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" | 31 | PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" |
24 | PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3" | 32 | PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3" |
25 | PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" | 33 | PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" |
26 | PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native" | 34 | PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native" |
35 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod" | ||
27 | 36 | ||
28 | inherit autotools gettext pkgconfig systemd | 37 | inherit autotools gettext pkgconfig systemd |
29 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base', '', d)} | 38 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'setuptools3-base', '', d)} |
30 | 39 | ||
31 | # exporter comes with python3-probes | 40 | # exporter comes with python3-probes |
32 | PACKAGES =+ "${PN}-exporter" | 41 | PACKAGES =+ "${PN}-exporter" |
33 | FILES_${PN}-exporter = "${sysconfdir}/stap-exporter/* \ | 42 | FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \ |
34 | ${sysconfdir}/sysconfig/stap-exporter \ | 43 | ${sysconfdir}/sysconfig/stap-exporter \ |
35 | ${systemd_unitdir}/system/stap-exporter.service \ | 44 | ${systemd_system_unitdir}/stap-exporter.service \ |
36 | ${sbindir}/stap-exporter" | 45 | ${sbindir}/stap-exporter" |
37 | RDEPENDS_${PN}-exporter = "${PN} python3-core python3-netclient" | 46 | RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient" |
38 | SYSTEMD_SERVICE_${PN}-exporter = "stap-exporter.service" | 47 | SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service" |
39 | 48 | ||
40 | PACKAGES =+ "${PN}-runtime" | 49 | PACKAGES =+ "${PN}-runtime" |
41 | FILES_${PN}-runtime = "\ | 50 | FILES:${PN}-runtime = "\ |
42 | ${bindir}/staprun \ | 51 | ${bindir}/staprun \ |
43 | ${bindir}/stap-merge \ | 52 | ${bindir}/stap-merge \ |
44 | ${bindir}/stapsh \ | 53 | ${bindir}/stapsh \ |
45 | ${libexecdir}/${BPN}/stapio \ | 54 | ${libexecdir}/${BPN}/stapio \ |
46 | " | 55 | " |
47 | RDEPENDS_${PN}_class-target += "${PN}-runtime" | 56 | RDEPENDS:${PN}:class-target += "${PN}-runtime" |
48 | 57 | ||
49 | PACKAGES =+ "${PN}-examples" | 58 | PACKAGES =+ "${PN}-examples" |
50 | FILES_${PN}-examples = "${datadir}/${BPN}/examples/" | 59 | FILES:${PN}-examples = "${datadir}/${BPN}/examples/" |
51 | RDEPENDS_${PN}-examples += "${PN}" | 60 | RDEPENDS:${PN}-examples += "${PN}" |
52 | 61 | ||
53 | # don't complain that some examples involve bash, perl, php... | 62 | # don't complain that some examples involve bash, perl, php... |
54 | INSANE_SKIP_${PN}-examples += "file-rdeps" | 63 | INSANE_SKIP:${PN}-examples += "file-rdeps" |
55 | 64 | ||
56 | PACKAGES =+ "${PN}-python" | 65 | PACKAGES =+ "${PN}-python" |
57 | FILES_${PN}-python += "\ | 66 | FILES:${PN}-python += "\ |
58 | ${bindir}/dtrace \ | 67 | ${bindir}/dtrace \ |
59 | ${libdir}/python*/ \ | 68 | ${libdir}/python*/ \ |
60 | ${libexecdir}/${BPN}/python/ \ | 69 | ${libexecdir}/${BPN}/python/ \ |
61 | " | 70 | " |
62 | # python material requires sdt headers | 71 | # python material requires sdt headers |
63 | RDEPENDS_${PN}-python += "${PN}-dev python3-core" | 72 | RDEPENDS:${PN}-python += "${PN}-dev python3-core" |
64 | INSANE_SKIP_${PN}-python += "dev-deps" | 73 | INSANE_SKIP:${PN}-python += "dev-deps" |
65 | 74 | ||
66 | do_configure_prepend () { | 75 | do_configure:prepend () { |
67 | # Improve reproducibility for c++ object files | 76 | # Improve reproducibility for c++ object files |
68 | reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" | 77 | reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" |
69 | sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h | 78 | sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h |
70 | } | 79 | } |
71 | 80 | ||
72 | do_install_append () { | 81 | do_install:append () { |
73 | if [ ! -f ${D}${bindir}/stap ]; then | 82 | if [ ! -f ${D}${bindir}/stap ]; then |
74 | # translator disabled case, need to leave only minimal runtime | 83 | # translator disabled case, need to leave only minimal runtime |
75 | rm -rf ${D}${datadir}/${PN} | 84 | rm -rf ${D}${datadir}/${PN} |
@@ -91,3 +100,7 @@ do_install_append () { | |||
91 | } | 100 | } |
92 | 101 | ||
93 | BBCLASSEXTEND = "nativesdk" | 102 | BBCLASSEXTEND = "nativesdk" |
103 | |||
104 | # Emits lot of warning which are treated as errors | ||
105 | # They must be looked into before disabling | ||
106 | TOOLCHAIN = "gcc" | ||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 016b423847..86336b0779 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
@@ -1,19 +1,16 @@ | |||
1 | LICENSE = "GPLv2" | 1 | LICENSE = "GPL-2.0-only" |
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
3 | SRCREV = "988f439af39a359b4387963ca4633649866d8275" | ||
4 | PV = "4.4" | ||
5 | 3 | ||
6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ | 4 | SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;tag=release-${PV} \ |
7 | file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ | 5 | file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ |
8 | file://0001-Install-python-modules-to-correct-library-dir.patch \ | 6 | file://0001-Install-python-modules-to-correct-library-dir.patch \ |
9 | file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ | 7 | file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ |
10 | file://0001-transport-protect-include-and-callsite-with-same-con.patch \ | ||
11 | " | 8 | " |
12 | 9 | ||
13 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' | 10 | SRCREV = "c4fc655170b534478a6b131292b987630c7c0865" |
14 | COMPATIBLE_HOST_libc-musl = 'null' | ||
15 | 11 | ||
16 | S = "${WORKDIR}/git" | 12 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' |
13 | COMPATIBLE_HOST:libc-musl = 'null' | ||
17 | 14 | ||
18 | # systemtap can't be built without optimization, if someone tries to compile an | 15 | # systemtap can't be built without optimization, if someone tries to compile an |
19 | # entire image as -O0, break with fatal. | 16 | # entire image as -O0, break with fatal. |