diff options
author | Victor Kamensky <victor.kamensky7@gmail.com> | 2023-12-04 22:32:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-06 22:55:49 +0000 |
commit | 5e8b43f8ca957933213069bdd699fe175df581ac (patch) | |
tree | 8c8f70b9908da90f05dbe8c827cb5f600b9b3ab3 | |
parent | 720ad02ae6b93c6d336254ca033b6eb5188c8be7 (diff) | |
download | poky-5e8b43f8ca957933213069bdd699fe175df581ac.tar.gz |
systemtap: do not install uprobes and uprobes sources
Addresses the following do_package_qa warning:
WARNING: systemtap-5.0-r0 do_package_qa: QA Issue: File /usr/share/systemtap/runtime/linux/uprobes/Makefile in package systemtap contains reference to TMPDIR
File /usr/share/systemtap/runtime/linux/uprobes/git_version.h in package systemtap contains reference to TMPDIR
File /usr/share/systemtap/runtime/linux/uprobes2/git_version.h in package systemtap contains reference to TMPDIR [buildpaths]
(From OE-Core rev: db668fdba9920fc4066eda8af0ff112f341ee09b)
Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch | 40 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch new file mode 100644 index 0000000000..2d46a3962d --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 5a01e28bd806326b2143e3e6bb28d4780c5d879d Mon Sep 17 00:00:00 2001 | ||
2 | From: Victor Kamensky <victor.kamensky7@gmail.com> | ||
3 | Date: Sun, 3 Dec 2023 18:40:05 -0800 | ||
4 | Subject: [PATCH] Makefile.am: remove runtime/linux/uprobes and | ||
5 | runtime/linux/uprobes2 install | ||
6 | |||
7 | "PR30434 continuation: Removed old uprobes, uprobes2 implementation, | ||
8 | uprobes-inc.h & any mentions of CONFIG_UTRACE." commit removed uprobes, | ||
9 | and uprobes2 sources and directories, but Makefile.am still tries to | ||
10 | install them. In fact after failing to 'cd' into runtime/linux/uprobes | ||
11 | directory it copies top level *.[ch] files into | ||
12 | ${prefix}/share/systemtap/runtime/linux/uprobes directory. | ||
13 | |||
14 | The issue was caught by OpenEmbedded project do_package_qa checks. | ||
15 | |||
16 | Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> | ||
17 | |||
18 | Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2023q4/027880.html] | ||
19 | --- | ||
20 | Makefile.am | 4 ---- | ||
21 | 1 file changed, 4 deletions(-) | ||
22 | |||
23 | diff --git a/Makefile.am b/Makefile.am | ||
24 | index 5737c6b20..2ba896088 100644 | ||
25 | --- a/Makefile.am | ||
26 | +++ b/Makefile.am | ||
27 | @@ -277,10 +277,6 @@ endif | ||
28 | do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/softfloat/$$f; done) | ||
29 | (cd $(srcdir)/runtime/linux; for f in *.[ch]; \ | ||
30 | do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/$$f; done) | ||
31 | - (cd $(srcdir)/runtime/linux/uprobes; for f in Makefile *.[ch]; \ | ||
32 | - do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes/$$f; done) | ||
33 | - (cd $(srcdir)/runtime/linux/uprobes2; for f in *.[ch]; \ | ||
34 | - do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes2/$$f; done) | ||
35 | (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name '*.stpm' -o -name README \) -print \ | ||
36 | | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) | ||
37 | (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ | ||
38 | -- | ||
39 | 2.31.1 | ||
40 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index bc2a9ff434..9fe85676fc 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
@@ -7,6 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ | |||
7 | file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ | 7 | file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ |
8 | file://0001-Install-python-modules-to-correct-library-dir.patch \ | 8 | file://0001-Install-python-modules-to-correct-library-dir.patch \ |
9 | file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ | 9 | file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ |
10 | file://0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch \ | ||
10 | file://0001-prerelease-datestamp-fixes.patch \ | 11 | file://0001-prerelease-datestamp-fixes.patch \ |
11 | " | 12 | " |
12 | 13 | ||