diff options
| author |   Yann Dirson <yann@blade-group.com> | 2020-11-12 18:26:16 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-13 14:31:56 +0000 |
| commit | 440dc8bacf6e6307ae8617194b75504702011b16 (patch) | |
| tree | 538b2df4e7483191381078a5d46f0d690a33951f | |
| parent | 75bca65ccdfe05da434a5c2b561e13f623499d53 (diff) | |
| download | openembedded-core-contrib-440dc8bacf6e6307ae8617194b75504702011b16.tar.gz | |
systemtap: split runtime material in its own package
Note the _class-target qualifier, here to prevent a funky dependency of
systemtap-native on systemtap-native-runtime-native. This possibly hints
to something deeper ?
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 1bb1c4bee4..7189e4e6c5 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -384,7 +384,7 @@ KERNEL_EXTRA_FEATURES_append = " features/debug/debug-kernel.scc" KERNEL_EXTRA_FEATURES_append = " features/systemtap/systemtap.scc" # add systemtap run-time into target image if it is not there yet -IMAGE_INSTALL_append = " systemtap" +IMAGE_INSTALL_append = " systemtap-runtime" """ def test_crosstap_helloworld(self): diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 74bf7cb35c..8dad5b15f0 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -36,6 +36,15 @@ FILES_${PN}-exporter = "${sysconfdir}/stap-exporter/* \ RDEPENDS_${PN}-exporter = "${PN} python3-core python3-netclient" SYSTEMD_SERVICE_${PN}-exporter = "stap-exporter.service" +PACKAGES =+ "${PN}-runtime" +FILES_${PN}-runtime = "\ + ${bindir}/staprun \ + ${bindir}/stap-merge \ + ${bindir}/stapsh \ + ${libexecdir}/${BPN}/stapio \ +" +RDEPENDS_${PN}_class-target += "${PN}-runtime" + PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${datadir}/${BPN}/examples/" RDEPENDS_${PN}-examples += "${PN}" |