* [PATCH 0/3] systemtap enhancements
@ 2012-01-24 21:46 Wade Farnsworth
2012-01-24 21:47 ` [PATCH 1/3] Bump systemtap SRCREV Wade Farnsworth
` (3 more replies)
0 siblings, 4 replies; 22+ messages in thread
From: Wade Farnsworth @ 2012-01-24 21:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
This provides several enhancements to the systemtap recipe to improve
end user experience.
Wade Farnsworth (3):
Bump systemtap SRCREV
systemtap: extend the recipe to build the native package
systemtap: build and install uprobes.ko
meta/recipes-kernel/systemtap/systemtap_git.bb | 63 ++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 1/3] Bump systemtap SRCREV 2012-01-24 21:46 [PATCH 0/3] systemtap enhancements Wade Farnsworth @ 2012-01-24 21:47 ` Wade Farnsworth 2012-01-24 21:48 ` [PATCH 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth ` (2 subsequent siblings) 3 siblings, 0 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-01-24 21:47 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Bump systemtap SRCREV to pick up several changes including additional ARM enhancements. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index ebacc43..7172386 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "elfutils sqlite3" -SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" -PR = "r2" +SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" +PR = "r3" PV = "1.6+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/3] systemtap: extend the recipe to build the native package 2012-01-24 21:46 [PATCH 0/3] systemtap enhancements Wade Farnsworth 2012-01-24 21:47 ` [PATCH 1/3] Bump systemtap SRCREV Wade Farnsworth @ 2012-01-24 21:48 ` Wade Farnsworth 2012-01-24 21:49 ` [PATCH 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth 3 siblings, 0 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-01-24 21:48 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Since the target image may not contain dev tools, it is useful to provide native systemtap in order to be able to compile systemtap scripts for the target. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 7172386..298e005 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,10 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "elfutils sqlite3" +DEPENDS = "elfutils sqlite3 systemtap-native" +DEPENDS_virtclass-native = "elfutils sqlite3 gettext-native" +DEPENDS_virtclass-nativesdk = "elfutils sqlite3 gettext-native" SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" -PR = "r3" +PR = "r4" PV = "1.6+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" @@ -28,4 +30,6 @@ S = "${WORKDIR}/git" inherit autotools gettext +BBCLASSEXTEND = "native nativesdk" + FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/3] systemtap: build and install uprobes.ko 2012-01-24 21:46 [PATCH 0/3] systemtap enhancements Wade Farnsworth 2012-01-24 21:47 ` [PATCH 1/3] Bump systemtap SRCREV Wade Farnsworth 2012-01-24 21:48 ` [PATCH 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth @ 2012-01-24 21:49 ` Wade Farnsworth 2012-01-24 23:38 ` Khem Raj 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth 3 siblings, 1 reply; 22+ messages in thread From: Wade Farnsworth @ 2012-01-24 21:49 UTC (permalink / raw) To: Patches and discussions about the oe-core layer SystemTap needs to provide uprobes.ko in order to support user space probing. Build and install the uprobes.ko on systems where it makes sense to. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 57 ++++++++++++++++++++++- 1 files changed, 54 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 298e005..22f3993 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,12 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "elfutils sqlite3 systemtap-native" +DEPENDS = "elfutils sqlite3 systemtap-native virtual/kernel" DEPENDS_virtclass-native = "elfutils sqlite3 gettext-native" DEPENDS_virtclass-nativesdk = "elfutils sqlite3 gettext-native" SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" -PR = "r4" +PR = "r5" PV = "1.6+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" @@ -28,8 +28,59 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' S = "${WORKDIR}/git" -inherit autotools gettext +inherit autotools gettext module-base BBCLASSEXTEND = "native nativesdk" +FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug" + +# Compile and install the uprobes kernel module. Note that staprun +# expects it in the systemtap/runtime directory, not in /lib/modules. +# Note that we only build uprobes on machines with utrace support. +do_compile_uprobes() { + if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_DIR}/.config + then + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C ${STAGING_KERNEL_DIR} scripts + oe_runmake KDIR=${STAGING_KERNEL_DIR} \ + M="${S}/runtime/uprobes/" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C "${S}/runtime/uprobes/" + fi +} + +do_compile_uprobes_virtclass-native() { + : +} + +do_compile_uprobes_virtclass-nativesdk() { + : +} + +do_compile_append() { + do_compile_uprobes +} + +do_install_uprobes() { + if [ -e "${S}/runtime/uprobes/uprobes.ko" ] + then + install -d ${D}/usr/share/systemtap/runtime/uprobes/ + install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/ + fi +} + +do_install_uprobes_virtclass-native() { + : +} + +do_install_uprobes_virtclass-nativesdk() { + : +} + +do_install_append() { + do_install_uprobes +} -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 3/3] systemtap: build and install uprobes.ko 2012-01-24 21:49 ` [PATCH 3/3] systemtap: build and install uprobes.ko Wade Farnsworth @ 2012-01-24 23:38 ` Khem Raj 0 siblings, 0 replies; 22+ messages in thread From: Khem Raj @ 2012-01-24 23:38 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, Jan 24, 2012 at 1:49 PM, Wade Farnsworth <wade_farnsworth@mentor.com> wrote: > SystemTap needs to provide uprobes.ko in order to support user space > probing. Build and install the uprobes.ko on systems where it makes > sense to. > > Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> > --- > meta/recipes-kernel/systemtap/systemtap_git.bb | 57 ++++++++++++++++++++++- > 1 files changed, 54 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb > index 298e005..22f3993 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.bb > +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb > @@ -2,12 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > -DEPENDS = "elfutils sqlite3 systemtap-native" > +DEPENDS = "elfutils sqlite3 systemtap-native virtual/kernel" > DEPENDS_virtclass-native = "elfutils sqlite3 gettext-native" > DEPENDS_virtclass-nativesdk = "elfutils sqlite3 gettext-native" > > SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" > -PR = "r4" > +PR = "r5" > PV = "1.6+git${SRCPV}" > > SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" > @@ -28,8 +28,59 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' > > S = "${WORKDIR}/git" > > -inherit autotools gettext > +inherit autotools gettext module-base > > BBCLASSEXTEND = "native nativesdk" > > +FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" > FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug" > + > +# Compile and install the uprobes kernel module. Note that staprun > +# expects it in the systemtap/runtime directory, not in /lib/modules. > +# Note that we only build uprobes on machines with utrace support. > +do_compile_uprobes() { > + if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_DIR}/.config > + then > + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP > + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ > + AR="${KERNEL_AR}" \ > + -C ${STAGING_KERNEL_DIR} scripts > + oe_runmake KDIR=${STAGING_KERNEL_DIR} \ > + M="${S}/runtime/uprobes/" \ > + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ > + AR="${KERNEL_AR}" \ > + -C "${S}/runtime/uprobes/" > + fi > +} > + > +do_compile_uprobes_virtclass-native() { > + : > +} > + > +do_compile_uprobes_virtclass-nativesdk() { > + : > +} > + > +do_compile_append() { > + do_compile_uprobes > +} > + > +do_install_uprobes() { > + if [ -e "${S}/runtime/uprobes/uprobes.ko" ] > + then > + install -d ${D}/usr/share/systemtap/runtime/uprobes/ > + install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/ > + fi > +} > + > +do_install_uprobes_virtclass-native() { > + : > +} > + > +do_install_uprobes_virtclass-nativesdk() { > + : > +} > + > +do_install_append() { > + do_install_uprobes > +} could this module be baked as a standalone recipe instead? since this now depends on kernel makes systemtap to be machine specific ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 0/3] systemtap enhancements 2012-01-24 21:46 [PATCH 0/3] systemtap enhancements Wade Farnsworth ` (2 preceding siblings ...) 2012-01-24 21:49 ` [PATCH 3/3] systemtap: build and install uprobes.ko Wade Farnsworth @ 2012-01-26 19:30 ` Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 1/3] Bump systemtap SRCREV Wade Farnsworth ` (3 more replies) 3 siblings, 4 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-01-26 19:30 UTC (permalink / raw) To: Patches and discussions about the oe-core layer This provides several enhancements to the systemtap recipe to improve end user experience. - v2: Move uprobes bits to a separate recipe per Khem's request. Wade Farnsworth (3): Bump systemtap SRCREV systemtap: extend the recipe to build the native package systemtap: build and install uprobes.ko .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 22 +++------- meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ 3 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 1/3] Bump systemtap SRCREV 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth @ 2012-01-26 19:31 ` Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth ` (2 subsequent siblings) 3 siblings, 0 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-01-26 19:31 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Bump systemtap SRCREV to pick up several changes including additional ARM enhancements. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index ebacc43..7172386 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "elfutils sqlite3" -SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" -PR = "r2" +SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" +PR = "r3" PV = "1.6+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v2 2/3] systemtap: extend the recipe to build the native package 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 1/3] Bump systemtap SRCREV Wade Farnsworth @ 2012-01-26 19:31 ` Wade Farnsworth 2012-01-27 10:03 ` Richard Purdie 2012-01-26 19:32 ` [PATCH v2 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth 3 siblings, 1 reply; 22+ messages in thread From: Wade Farnsworth @ 2012-01-26 19:31 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Since the target image may not contain dev tools, it is useful to provide native systemtap in order to be able to compile systemtap scripts for the target. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 7172386..298e005 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,10 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "elfutils sqlite3" +DEPENDS = "elfutils sqlite3 systemtap-native" +DEPENDS_virtclass-native = "elfutils sqlite3 gettext-native" +DEPENDS_virtclass-nativesdk = "elfutils sqlite3 gettext-native" SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" -PR = "r3" +PR = "r4" PV = "1.6+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" @@ -28,4 +30,6 @@ S = "${WORKDIR}/git" inherit autotools gettext +BBCLASSEXTEND = "native nativesdk" + FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH v2 2/3] systemtap: extend the recipe to build the native package 2012-01-26 19:31 ` [PATCH v2 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth @ 2012-01-27 10:03 ` Richard Purdie 0 siblings, 0 replies; 22+ messages in thread From: Richard Purdie @ 2012-01-27 10:03 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2012-01-26 at 12:31 -0700, Wade Farnsworth wrote: > Since the target image may not contain dev tools, it is useful to > provide native systemtap in order to be able to compile systemtap > scripts for the target. > > Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> > --- > meta/recipes-kernel/systemtap/systemtap_git.bb | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb > index 7172386..298e005 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.bb > +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb > @@ -2,10 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > -DEPENDS = "elfutils sqlite3" > +DEPENDS = "elfutils sqlite3 systemtap-native" > +DEPENDS_virtclass-native = "elfutils sqlite3 gettext-native" > +DEPENDS_virtclass-nativesdk = "elfutils sqlite3 gettext-native" This looks wrong, a -native shouldn't be depending on a non-native recipe? (likewise -nativesdk, shouldn't those be -nativesdk dependencies?) Cheers, Richard ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 3/3] systemtap: build and install uprobes.ko 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 1/3] Bump systemtap SRCREV Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth @ 2012-01-26 19:32 ` Wade Farnsworth 2012-01-27 10:05 ` Richard Purdie 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth 3 siblings, 1 reply; 22+ messages in thread From: Wade Farnsworth @ 2012-01-26 19:32 UTC (permalink / raw) To: Patches and discussions about the oe-core layer SystemTap needs to provide uprobes.ko in order to support user space probing. Build and install the module on systems that support it. Additionally, split off common bits into systemtap_git.inc. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 18 +------- meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ 3 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb new file mode 100644 index 0000000..7ae9cb8 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "UProbes kernel module for SystemTap" + +require systemtap_git.inc + +DEPENDS = "virtual/gettext systemtap virtual/kernel" + +PR = "r0" + +# On systems without CONFIG_UTRACE, this package is empty. +ALLOW_EMPTY = 1 + +inherit module-base + +FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" + +EXTRA_OEMAKE = "" + +# 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_DIR}/.config + then + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C ${STAGING_KERNEL_DIR} scripts + oe_runmake KDIR=${STAGING_KERNEL_DIR} \ + M="${S}/runtime/uprobes/" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C "${S}/runtime/uprobes/" + fi +} + +do_install() { + if [ -e "${S}/runtime/uprobes/uprobes.ko" ] + then + install -d ${D}/usr/share/systemtap/runtime/uprobes/ + install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/ + fi +} diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 298e005..8c6f9a0 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -1,16 +1,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analysis tool for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +require systemtap_git.inc DEPENDS = "elfutils sqlite3 systemtap-native" DEPENDS_virtclass-native = "elfutils sqlite3 gettext-native" DEPENDS_virtclass-nativesdk = "elfutils sqlite3 gettext-native" -SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" -PR = "r4" -PV = "1.6+git${SRCPV}" - -SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" +PR = "r5" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_nss=no \ @@ -20,14 +16,6 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_avahi_client=no \ ac_cv_file__usr_include_avahi_common=no " -SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" -SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" - -# systemtap doesn't support mips -COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' - -S = "${WORKDIR}/git" - inherit autotools gettext BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc new file mode 100644 index 0000000..2e41d7d --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -0,0 +1,16 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "a56e4b7800e3fa8f9df6f4434cb02f86f6e995bc" +PV = "1.6+git${SRCPV}" + +SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" + +SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" +SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" + +# systemtap doesn't support mips +COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' + +S = "${WORKDIR}/git" + -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH v2 3/3] systemtap: build and install uprobes.ko 2012-01-26 19:32 ` [PATCH v2 3/3] systemtap: build and install uprobes.ko Wade Farnsworth @ 2012-01-27 10:05 ` Richard Purdie 0 siblings, 0 replies; 22+ messages in thread From: Richard Purdie @ 2012-01-27 10:05 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2012-01-26 at 12:32 -0700, Wade Farnsworth wrote: > SystemTap needs to provide uprobes.ko in order to support user space > probing. Build and install the module on systems that support it. > > Additionally, split off common bits into systemtap_git.inc. > > Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> > --- > .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ > meta/recipes-kernel/systemtap/systemtap_git.bb | 18 +------- > meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ > 3 files changed, 61 insertions(+), 15 deletions(-) > create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb > create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc > > diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb > new file mode 100644 > index 0000000..7ae9cb8 > --- /dev/null > +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb > @@ -0,0 +1,42 @@ > +DESCRIPTION = "UProbes kernel module for SystemTap" > + > +require systemtap_git.inc > + > +DEPENDS = "virtual/gettext systemtap virtual/kernel" > + > +PR = "r0" > + > +# On systems without CONFIG_UTRACE, this package is empty. > +ALLOW_EMPTY = 1 This should really be: ALLOW_EMPTY_${PN} = "1" Cheers, Richard ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v3 0/3] systemtap enhancements 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth ` (2 preceding siblings ...) 2012-01-26 19:32 ` [PATCH v2 3/3] systemtap: build and install uprobes.ko Wade Farnsworth @ 2012-02-03 19:28 ` Wade Farnsworth 2012-02-03 19:28 ` [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth ` (3 more replies) 3 siblings, 4 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-02-03 19:28 UTC (permalink / raw) To: Patches and discussions about the oe-core layer This provides several enhancements to the systemtap recipe to improve end user experience. - v2: Move uprobes bits to a separate recipe - v3: Fix -native[sdk] DEPENDS in systemtap_git.bb Change to ALLOW_EMPTY_${PN} in systemtap-uprobes_git.bb Updated SRCREV to pull stable version 1.7 Wade Farnsworth (3): Bump systemtap SRCREV systemtap: extend the recipe to build the native package systemtap: build and install uprobes.ko .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 22 +++------- meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ 3 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth @ 2012-02-03 19:28 ` Wade Farnsworth 2012-02-03 20:31 ` Khem Raj 2012-02-03 19:29 ` [PATCH v3 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth ` (2 subsequent siblings) 3 siblings, 1 reply; 22+ messages in thread From: Wade Farnsworth @ 2012-02-03 19:28 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Bump SRCREV to the latest stable version of systemtap. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index ebacc43..e3e21d8 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "elfutils sqlite3" -SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" -PR = "r2" -PV = "1.6+git${SRCPV}" +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" +PR = "r3" +PV = "1.7+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 2012-02-03 19:28 ` [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth @ 2012-02-03 20:31 ` Khem Raj 0 siblings, 0 replies; 22+ messages in thread From: Khem Raj @ 2012-02-03 20:31 UTC (permalink / raw) To: Wade Farnsworth; +Cc: Patches and discussions about the oe-core layer On (03/02/12 12:28), Wade Farnsworth wrote: > Bump SRCREV to the latest stable version of systemtap. > > Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> > --- > meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb > index ebacc43..e3e21d8 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.bb > +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb > @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > DEPENDS = "elfutils sqlite3" > > -SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" > -PR = "r2" > -PV = "1.6+git${SRCPV}" > +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" > +PR = "r3" since PV was being upped PR could have been reset to 0 > +PV = "1.7+git${SRCPV}" > > SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" > > -- > 1.7.0.4 > -- -Khem ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v3 2/3] systemtap: extend the recipe to build the native package 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth 2012-02-03 19:28 ` [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth @ 2012-02-03 19:29 ` Wade Farnsworth 2012-02-03 19:30 ` [PATCH v3 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2012-02-06 14:47 ` [PATCH v4 0/3] systemtap enhancements Wade Farnsworth 3 siblings, 0 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-02-03 19:29 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Since the target image may not contain dev tools, it is useful to provide native systemtap in order to be able to compile systemtap scripts for the target. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index e3e21d8..e3caab7 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,10 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "elfutils sqlite3" +DEPENDS = "elfutils sqlite3 systemtap-native" +DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" +DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" -PR = "r3" +PR = "r4" PV = "1.7+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" @@ -28,4 +30,6 @@ S = "${WORKDIR}/git" inherit autotools gettext +BBCLASSEXTEND = "native nativesdk" + FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v3 3/3] systemtap: build and install uprobes.ko 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth 2012-02-03 19:28 ` [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth 2012-02-03 19:29 ` [PATCH v3 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth @ 2012-02-03 19:30 ` Wade Farnsworth 2012-02-03 20:55 ` Khem Raj 2012-02-06 14:47 ` [PATCH v4 0/3] systemtap enhancements Wade Farnsworth 3 siblings, 1 reply; 22+ messages in thread From: Wade Farnsworth @ 2012-02-03 19:30 UTC (permalink / raw) To: Patches and discussions about the oe-core layer SystemTap needs to provide uprobes.ko in order to support user space probing. Build and install the module on systems that support it. Additionally, split off common bits into systemtap_git.inc. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 18 +------- meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ 3 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb new file mode 100644 index 0000000..fc0e957 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "UProbes kernel module for SystemTap" + +require systemtap_git.inc + +DEPENDS = "virtual/gettext systemtap virtual/kernel" + +PR = "r0" + +# On systems without CONFIG_UTRACE, this package is empty. +ALLOW_EMPTY_${PN} = 1 + +inherit module-base + +FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" + +EXTRA_OEMAKE = "" + +# 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_DIR}/.config + then + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C ${STAGING_KERNEL_DIR} scripts + oe_runmake KDIR=${STAGING_KERNEL_DIR} \ + M="${S}/runtime/uprobes/" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C "${S}/runtime/uprobes/" + fi +} + +do_install() { + if [ -e "${S}/runtime/uprobes/uprobes.ko" ] + then + install -d ${D}/usr/share/systemtap/runtime/uprobes/ + install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/ + fi +} diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index e3caab7..6eef51e 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -1,16 +1,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analysis tool for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +require systemtap_git.inc DEPENDS = "elfutils sqlite3 systemtap-native" DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" -SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" -PR = "r4" -PV = "1.7+git${SRCPV}" - -SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" +PR = "r5" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_nss=no \ @@ -20,14 +16,6 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_avahi_client=no \ ac_cv_file__usr_include_avahi_common=no " -SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" -SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" - -# systemtap doesn't support mips -COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' - -S = "${WORKDIR}/git" - inherit autotools gettext BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc new file mode 100644 index 0000000..cc250ff --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -0,0 +1,16 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" +PV = "1.7+git${SRCPV}" + +SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" + +SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" +SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" + +# systemtap doesn't support mips +COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' + +S = "${WORKDIR}/git" + -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH v3 3/3] systemtap: build and install uprobes.ko 2012-02-03 19:30 ` [PATCH v3 3/3] systemtap: build and install uprobes.ko Wade Farnsworth @ 2012-02-03 20:55 ` Khem Raj 0 siblings, 0 replies; 22+ messages in thread From: Khem Raj @ 2012-02-03 20:55 UTC (permalink / raw) To: Wade Farnsworth; +Cc: Patches and discussions about the oe-core layer On (03/02/12 12:30), Wade Farnsworth wrote: > SystemTap needs to provide uprobes.ko in order to support user space > probing. Build and install the module on systems that support it. > > Additionally, split off common bits into systemtap_git.inc. > > Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> > --- > .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ > meta/recipes-kernel/systemtap/systemtap_git.bb | 18 +------- > meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ > 3 files changed, 61 insertions(+), 15 deletions(-) > create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb > create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc > > diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb > new file mode 100644 > index 0000000..fc0e957 > --- /dev/null > +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb > @@ -0,0 +1,42 @@ > +DESCRIPTION = "UProbes kernel module for SystemTap" > + > +require systemtap_git.inc > + > +DEPENDS = "virtual/gettext systemtap virtual/kernel" would inheriting gettext class be better here ? > + > +PR = "r0" > + > +# On systems without CONFIG_UTRACE, this package is empty. > +ALLOW_EMPTY_${PN} = 1 > + > +inherit module-base > + > +FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" > + > +EXTRA_OEMAKE = "" > + > +# 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_DIR}/.config > + then > + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP > + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ > + AR="${KERNEL_AR}" \ > + -C ${STAGING_KERNEL_DIR} scripts > + oe_runmake KDIR=${STAGING_KERNEL_DIR} \ > + M="${S}/runtime/uprobes/" \ > + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ > + AR="${KERNEL_AR}" \ > + -C "${S}/runtime/uprobes/" > + fi > +} > + > +do_install() { > + if [ -e "${S}/runtime/uprobes/uprobes.ko" ] > + then > + install -d ${D}/usr/share/systemtap/runtime/uprobes/ > + install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/ > + fi > +} > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb > index e3caab7..6eef51e 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.bb > +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb > @@ -1,16 +1,12 @@ > DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analysis tool for Linux" > -LICENSE = "GPLv2" > -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > + > +require systemtap_git.inc > > DEPENDS = "elfutils sqlite3 systemtap-native" > DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" > DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" > > -SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" > -PR = "r4" > -PV = "1.7+git${SRCPV}" > - > -SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" > +PR = "r5" > > EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ > ac_cv_file__usr_include_nss=no \ > @@ -20,14 +16,6 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ > ac_cv_file__usr_include_avahi_client=no \ > ac_cv_file__usr_include_avahi_common=no " > > -SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" > -SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" > - > -# systemtap doesn't support mips > -COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' > - > -S = "${WORKDIR}/git" > - > inherit autotools gettext > > BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc > new file mode 100644 > index 0000000..cc250ff > --- /dev/null > +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc > @@ -0,0 +1,16 @@ > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > + > +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" > +PV = "1.7+git${SRCPV}" > + > +SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" > + > +SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" > +SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" > + > +# systemtap doesn't support mips > +COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' > + > +S = "${WORKDIR}/git" > + > -- > 1.7.0.4 > -- -Khem ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 0/3] systemtap enhancements 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth ` (2 preceding siblings ...) 2012-02-03 19:30 ` [PATCH v3 3/3] systemtap: build and install uprobes.ko Wade Farnsworth @ 2012-02-06 14:47 ` Wade Farnsworth 2012-02-06 14:47 ` [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth ` (2 more replies) 3 siblings, 3 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-02-06 14:47 UTC (permalink / raw) To: Patches and discussions about the oe-core layer This provides several enhancements to the systemtap recipe to improve end user experience. - v2: Move uprobes bits to a separate recipe - v3: Fix -native[sdk] DEPENDS in systemtap_git.bb Change to ALLOW_EMPTY_${PN} in systemtap-uprobes_git.bb Updated SRCREV to pull stable version 1.7 - v4: Reset PR due to change in PV for systemtap_git.bb Make systemtap-uprobes_git.bb inherit gettext Wade Farnsworth (3): systemtap: bump SRCREV to grab version 1.7 systemtap: extend the recipe to build the native package systemtap: build and install uprobes.ko .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 22 +++------- meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ 3 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 2012-02-06 14:47 ` [PATCH v4 0/3] systemtap enhancements Wade Farnsworth @ 2012-02-06 14:47 ` Wade Farnsworth 2012-02-08 4:05 ` Saul Wold 2012-02-06 14:48 ` [PATCH v4 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth 2012-02-06 14:49 ` [PATCH v4 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2 siblings, 1 reply; 22+ messages in thread From: Wade Farnsworth @ 2012-02-06 14:47 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Bump SRCREV to the latest stable version of systemtap. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index ebacc43..dff08ee 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "elfutils sqlite3" -SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" -PR = "r2" -PV = "1.6+git${SRCPV}" +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" +PR = "r0" +PV = "1.7+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 2012-02-06 14:47 ` [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth @ 2012-02-08 4:05 ` Saul Wold 0 siblings, 0 replies; 22+ messages in thread From: Saul Wold @ 2012-02-08 4:05 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 02/06/2012 06:47 AM, Wade Farnsworth wrote: > Bump SRCREV to the latest stable version of systemtap. > > Signed-off-by: Wade Farnsworth<wade_farnsworth@mentor.com> > --- > meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb > index ebacc43..dff08ee 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.bb > +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb > @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > DEPENDS = "elfutils sqlite3" > > -SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" > -PR = "r2" > -PV = "1.6+git${SRCPV}" > +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" > +PR = "r0" > +PV = "1.7+git${SRCPV}" > > SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" > Merged v4 into OE-core Thanks for your support Sau! ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 2/3] systemtap: extend the recipe to build the native package 2012-02-06 14:47 ` [PATCH v4 0/3] systemtap enhancements Wade Farnsworth 2012-02-06 14:47 ` [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth @ 2012-02-06 14:48 ` Wade Farnsworth 2012-02-06 14:49 ` [PATCH v4 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2 siblings, 0 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-02-06 14:48 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Since the target image may not contain dev tools, it is useful to provide native systemtap in order to be able to compile systemtap scripts for the target. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- meta/recipes-kernel/systemtap/systemtap_git.bb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index dff08ee..fb3c0ef 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,10 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "elfutils sqlite3" +DEPENDS = "elfutils sqlite3 systemtap-native" +DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" +DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" -PR = "r0" +PR = "r1" PV = "1.7+git${SRCPV}" SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" @@ -28,4 +30,6 @@ S = "${WORKDIR}/git" inherit autotools gettext +BBCLASSEXTEND = "native nativesdk" + FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v4 3/3] systemtap: build and install uprobes.ko 2012-02-06 14:47 ` [PATCH v4 0/3] systemtap enhancements Wade Farnsworth 2012-02-06 14:47 ` [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth 2012-02-06 14:48 ` [PATCH v4 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth @ 2012-02-06 14:49 ` Wade Farnsworth 2 siblings, 0 replies; 22+ messages in thread From: Wade Farnsworth @ 2012-02-06 14:49 UTC (permalink / raw) To: Patches and discussions about the oe-core layer SystemTap needs to provide uprobes.ko in order to support user space probing. Build and install the module on systems that support it. Additionally, split off common bits into systemtap_git.inc. Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> --- .../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 18 +------- meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++ 3 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb new file mode 100644 index 0000000..7fa6748 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "UProbes kernel module for SystemTap" + +require systemtap_git.inc + +DEPENDS = "systemtap virtual/kernel" + +PR = "r0" + +# On systems without CONFIG_UTRACE, this package is empty. +ALLOW_EMPTY_${PN} = 1 + +inherit module-base gettext + +FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" + +EXTRA_OEMAKE = "" + +# 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_DIR}/.config + then + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C ${STAGING_KERNEL_DIR} scripts + oe_runmake KDIR=${STAGING_KERNEL_DIR} \ + M="${S}/runtime/uprobes/" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + -C "${S}/runtime/uprobes/" + fi +} + +do_install() { + if [ -e "${S}/runtime/uprobes/uprobes.ko" ] + then + install -d ${D}/usr/share/systemtap/runtime/uprobes/ + install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/ + fi +} diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index fb3c0ef..c4a9d87 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -1,16 +1,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analysis tool for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +require systemtap_git.inc DEPENDS = "elfutils sqlite3 systemtap-native" DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" -SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" -PR = "r1" -PV = "1.7+git${SRCPV}" - -SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" +PR = "r2" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_nss=no \ @@ -20,14 +16,6 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_avahi_client=no \ ac_cv_file__usr_include_avahi_common=no " -SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" -SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" - -# systemtap doesn't support mips -COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' - -S = "${WORKDIR}/git" - inherit autotools gettext BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc new file mode 100644 index 0000000..cc250ff --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -0,0 +1,16 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" +PV = "1.7+git${SRCPV}" + +SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" + +SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" +SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" + +# systemtap doesn't support mips +COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux' + +S = "${WORKDIR}/git" + -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2012-02-08 4:13 UTC | newest] Thread overview: 22+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-24 21:46 [PATCH 0/3] systemtap enhancements Wade Farnsworth 2012-01-24 21:47 ` [PATCH 1/3] Bump systemtap SRCREV Wade Farnsworth 2012-01-24 21:48 ` [PATCH 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth 2012-01-24 21:49 ` [PATCH 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2012-01-24 23:38 ` Khem Raj 2012-01-26 19:30 ` [PATCH v2 0/3] systemtap enhancements Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 1/3] Bump systemtap SRCREV Wade Farnsworth 2012-01-26 19:31 ` [PATCH v2 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth 2012-01-27 10:03 ` Richard Purdie 2012-01-26 19:32 ` [PATCH v2 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2012-01-27 10:05 ` Richard Purdie 2012-02-03 19:28 ` [PATCH v3 0/3] systemtap enhancements Wade Farnsworth 2012-02-03 19:28 ` [PATCH v3 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth 2012-02-03 20:31 ` Khem Raj 2012-02-03 19:29 ` [PATCH v3 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth 2012-02-03 19:30 ` [PATCH v3 3/3] systemtap: build and install uprobes.ko Wade Farnsworth 2012-02-03 20:55 ` Khem Raj 2012-02-06 14:47 ` [PATCH v4 0/3] systemtap enhancements Wade Farnsworth 2012-02-06 14:47 ` [PATCH v4 1/3] systemtap: bump SRCREV to grab version 1.7 Wade Farnsworth 2012-02-08 4:05 ` Saul Wold 2012-02-06 14:48 ` [PATCH v4 2/3] systemtap: extend the recipe to build the native package Wade Farnsworth 2012-02-06 14:49 ` [PATCH v4 3/3] systemtap: build and install uprobes.ko Wade Farnsworth
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox