From: Victor Kamensky Date: Tue, 5 Dec 2023 06:32:49 +0000 (-0800) Subject: systemtap-uprobes: removed as obsolete X-Git-Tag: yocto-5.2~4395 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42fd5abedb835b6f87721674001c52304e43cfc5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git systemtap-uprobes: removed as obsolete systemtap-uprobes package was not used for a long time - since kernel itself provided uprobes support. Now source code of old uprobes kernel module was removed from systemtap git repo by "PR30434 continuation: Removed old uprobes, uprobes2 implementation, uprobes-inc.h & any mentions of CONFIG_UTRACE." it is good time for us to gid rid of it too. Signed-off-by: Victor Kamensky Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e43c0acd80c..e6131c815a0 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -317,7 +317,6 @@ DISTRO_PN_ALIAS:pn-sysprof = "Fedora=sysprof Debian=sysprof" DISTRO_PN_ALIAS:pn-systemd-compat-units = "Fedora=systemd Ubuntu=systemd" DISTRO_PN_ALIAS:pn-systemd-systemctl = "OE-Core" DISTRO_PN_ALIAS:pn-systemd-systemdctl = "Fedora=systemd Ubuntu=systemd" -DISTRO_PN_ALIAS:pn-systemtap-uprobes = "Ubuntu=systemtap Debian=systemtap" DISTRO_PN_ALIAS:pn-sysvinit-inittab = "OE-Core" DISTRO_PN_ALIAS:pn-tar-replacement = "Fedora=tar Ubuntu=tar" DISTRO_PN_ALIAS:pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2c59db56ac6..445f797bcb7 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -794,7 +794,6 @@ RECIPE_MAINTAINER:pn-systemd-serialgetty = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-systemctl-native = "Chen Qi " RECIPE_MAINTAINER:pn-systemtap = "Victor Kamensky " RECIPE_MAINTAINER:pn-systemtap-native = "Victor Kamensky " -RECIPE_MAINTAINER:pn-systemtap-uprobes = "Victor Kamensky " RECIPE_MAINTAINER:pn-sysvinit = "Ross Burton " RECIPE_MAINTAINER:pn-sysvinit-inittab = "Ross Burton " RECIPE_MAINTAINER:pn-taglib = "Anuj Mittal " 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 3d35481bdc9..00000000000 --- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "UProbes kernel module for SystemTap" -HOMEPAGE = "https://sourceware.org/systemtap/" -require systemtap_git.inc - -DEPENDS = "systemtap virtual/kernel" - -# On systems without CONFIG_UTRACE, this package is empty. -ALLOW_EMPTY:${PN} = "1" - -inherit module-base gettext - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:" - -FILES:${PN} += "${datadir}/systemtap/runtime/uprobes" - -# Compile and install the uprobes kernel module on machines with utrace -# support. Note that staprun expects it in the systemtap/runtime directory, -# not in /lib/modules. -do_compile() { - if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_BUILDDIR}/.config - then - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ - STRIP="${KERNEL_STRIP}" \ - -C ${STAGING_KERNEL_DIR} scripts - oe_runmake KDIR=${STAGING_KERNEL_DIR} \ - M="${S}/runtime/uprobes/" \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ - STRIP="${KERNEL_STRIP}" \ - -C "${S}/runtime/uprobes/" - fi -} - -do_install() { - if [ -e "${S}/runtime/uprobes/uprobes.ko" ] - then - install -d ${D}${datadir}/systemtap/runtime/uprobes/ - install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}${datadir}/systemtap/runtime/uprobes/ - fi -}