diff options
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap_git.bb')
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index c4a6eef59a..68f5c76428 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -6,7 +6,10 @@ HOMEPAGE = "https://sourceware.org/systemtap/" require systemtap_git.inc -SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch" +SRC_URI += " \ + file://0001-improve-reproducibility-for-c-compiling.patch \ + file://0001-staprun-address-ncurses-6.3-failures.patch \ + " DEPENDS = "elfutils" @@ -21,58 +24,62 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs" EXTRA_OECONF += "${STAP_DOCS} " -PACKAGECONFIG ??= "translator sqlite monitor python3-probes" +PACKAGECONFIG ??= "translator sqlite monitor python3-probes ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" PACKAGECONFIG[translator] = "--enable-translator,--disable-translator,boost,bash" PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3" PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native" +PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod" inherit autotools gettext pkgconfig systemd -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base', '', d)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'setuptools3-base', '', d)} + +# | ../git/elaborate.cxx:2601:21: error: storing the address of local variable 'sym' in '*s.systemtap_session::symbol_resolver' [-Werror=dangling-pointer=] +CXXFLAGS += "-Wno-dangling-pointer" # exporter comes with python3-probes PACKAGES =+ "${PN}-exporter" -FILES_${PN}-exporter = "${sysconfdir}/stap-exporter/* \ +FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \ ${sysconfdir}/sysconfig/stap-exporter \ - ${systemd_unitdir}/system/stap-exporter.service \ + ${systemd_system_unitdir}/stap-exporter.service \ ${sbindir}/stap-exporter" -RDEPENDS_${PN}-exporter = "${PN} python3-core python3-netclient" -SYSTEMD_SERVICE_${PN}-exporter = "stap-exporter.service" +RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient" +SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service" PACKAGES =+ "${PN}-runtime" -FILES_${PN}-runtime = "\ +FILES:${PN}-runtime = "\ ${bindir}/staprun \ ${bindir}/stap-merge \ ${bindir}/stapsh \ ${libexecdir}/${BPN}/stapio \ " -RDEPENDS_${PN}_class-target += "${PN}-runtime" +RDEPENDS:${PN}:class-target += "${PN}-runtime" PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${datadir}/${BPN}/examples/" -RDEPENDS_${PN}-examples += "${PN}" +FILES:${PN}-examples = "${datadir}/${BPN}/examples/" +RDEPENDS:${PN}-examples += "${PN}" # don't complain that some examples involve bash, perl, php... -INSANE_SKIP_${PN}-examples += "file-rdeps" +INSANE_SKIP:${PN}-examples += "file-rdeps" PACKAGES =+ "${PN}-python" -FILES_${PN}-python += "\ +FILES:${PN}-python += "\ ${bindir}/dtrace \ ${libdir}/python*/ \ ${libexecdir}/${BPN}/python/ \ " # python material requires sdt headers -RDEPENDS_${PN}-python += "${PN}-dev python3-core" -INSANE_SKIP_${PN}-python += "dev-deps" +RDEPENDS:${PN}-python += "${PN}-dev python3-core" +INSANE_SKIP:${PN}-python += "dev-deps" -do_configure_prepend () { +do_configure:prepend () { # Improve reproducibility for c++ object files reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h } -do_install_append () { +do_install:append () { if [ ! -f ${D}${bindir}/stap ]; then # translator disabled case, need to leave only minimal runtime rm -rf ${D}${datadir}/${PN} |