diff options
-rw-r--r-- | meta/conf/distro/include/distro_alias.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb | 42 |
3 files changed, 0 insertions, 44 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e43c0acd80..e6131c815a 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" | |||
317 | DISTRO_PN_ALIAS:pn-systemd-compat-units = "Fedora=systemd Ubuntu=systemd" | 317 | DISTRO_PN_ALIAS:pn-systemd-compat-units = "Fedora=systemd Ubuntu=systemd" |
318 | DISTRO_PN_ALIAS:pn-systemd-systemctl = "OE-Core" | 318 | DISTRO_PN_ALIAS:pn-systemd-systemctl = "OE-Core" |
319 | DISTRO_PN_ALIAS:pn-systemd-systemdctl = "Fedora=systemd Ubuntu=systemd" | 319 | DISTRO_PN_ALIAS:pn-systemd-systemdctl = "Fedora=systemd Ubuntu=systemd" |
320 | DISTRO_PN_ALIAS:pn-systemtap-uprobes = "Ubuntu=systemtap Debian=systemtap" | ||
321 | DISTRO_PN_ALIAS:pn-sysvinit-inittab = "OE-Core" | 320 | DISTRO_PN_ALIAS:pn-sysvinit-inittab = "OE-Core" |
322 | DISTRO_PN_ALIAS:pn-tar-replacement = "Fedora=tar Ubuntu=tar" | 321 | DISTRO_PN_ALIAS:pn-tar-replacement = "Fedora=tar Ubuntu=tar" |
323 | DISTRO_PN_ALIAS:pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" | 322 | 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 2c59db56ac..445f797bcb 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 <Qi.Chen@windriver.com>" | |||
794 | RECIPE_MAINTAINER:pn-systemd-systemctl-native = "Chen Qi <Qi.Chen@windriver.com>" | 794 | RECIPE_MAINTAINER:pn-systemd-systemctl-native = "Chen Qi <Qi.Chen@windriver.com>" |
795 | RECIPE_MAINTAINER:pn-systemtap = "Victor Kamensky <victor.kamensky7@gmail.com>" | 795 | RECIPE_MAINTAINER:pn-systemtap = "Victor Kamensky <victor.kamensky7@gmail.com>" |
796 | RECIPE_MAINTAINER:pn-systemtap-native = "Victor Kamensky <victor.kamensky7@gmail.com>" | 796 | RECIPE_MAINTAINER:pn-systemtap-native = "Victor Kamensky <victor.kamensky7@gmail.com>" |
797 | RECIPE_MAINTAINER:pn-systemtap-uprobes = "Victor Kamensky <victor.kamensky7@gmail.com>" | ||
798 | RECIPE_MAINTAINER:pn-sysvinit = "Ross Burton <ross.burton@arm.com>" | 797 | RECIPE_MAINTAINER:pn-sysvinit = "Ross Burton <ross.burton@arm.com>" |
799 | RECIPE_MAINTAINER:pn-sysvinit-inittab = "Ross Burton <ross.burton@arm.com>" | 798 | RECIPE_MAINTAINER:pn-sysvinit-inittab = "Ross Burton <ross.burton@arm.com>" |
800 | RECIPE_MAINTAINER:pn-taglib = "Anuj Mittal <anuj.mittal@intel.com>" | 799 | RECIPE_MAINTAINER:pn-taglib = "Anuj Mittal <anuj.mittal@intel.com>" |
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 3d35481bdc..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | SUMMARY = "UProbes kernel module for SystemTap" | ||
2 | HOMEPAGE = "https://sourceware.org/systemtap/" | ||
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}" OBJCOPY="${KERNEL_OBJCOPY}" \ | ||
25 | STRIP="${KERNEL_STRIP}" \ | ||
26 | -C ${STAGING_KERNEL_DIR} scripts | ||
27 | oe_runmake KDIR=${STAGING_KERNEL_DIR} \ | ||
28 | M="${S}/runtime/uprobes/" \ | ||
29 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | ||
30 | AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ | ||
31 | STRIP="${KERNEL_STRIP}" \ | ||
32 | -C "${S}/runtime/uprobes/" | ||
33 | fi | ||
34 | } | ||
35 | |||
36 | do_install() { | ||
37 | if [ -e "${S}/runtime/uprobes/uprobes.ko" ] | ||
38 | then | ||
39 | install -d ${D}${datadir}/systemtap/runtime/uprobes/ | ||
40 | install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}${datadir}/systemtap/runtime/uprobes/ | ||
41 | fi | ||
42 | } | ||