initial commit for Enea Linux 4.0

Migrated from the internal git server on the daisy-enea branch

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

6 files changed, 240 insertions, 0 deletions

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 0000000000..ab9acba023
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -0,0 +1,42 @@
+SUMMARY = "UProbes kernel module for SystemTap"
+
+require systemtap_git.inc
+
+DEPENDS = "systemtap virtual/kernel"
+
+PR = "r1"
+
+# 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}${datadir}/systemtap/runtime/uprobes/
+                install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}${datadir}/systemtap/runtime/uprobes/
+        fi
+}
diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
new file mode 100644
index 0000000000..33a89940ae
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+
+Index: git/doc/SystemTap_Tapset_Reference/Makefile.am
+===================================================================
+--- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 08:43:46.263339003 -0500
++++ git/doc/SystemTap_Tapset_Reference/Makefile.am      2012-04-13 09:31:22.470083915 -0500
+@@ -27,6 +27,10 @@
+ noinst_PROGRAMS = docproc
+ SRCTREE=$(abs_top_srcdir)/
+ DOCPROC=$(abs_builddir)/docproc
++docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
++
++docproc.o: $(srcdir)/docproc.c
++       $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c
+ 
+ all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
+ tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp')
diff --git a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..988cda4f0c
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Pending
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -19,7 +19,6 @@ AC_PROG_LN_S
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_CPP
+-AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+ AC_PROG_RANLIB
+ AC_OBJEXT
diff --git a/meta/recipes-kernel/systemtap/systemtap/scheduler-stp.patch b/meta/recipes-kernel/systemtap/systemtap/scheduler-stp.patch
new file mode 100644
index 0000000000..9897e481a3
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/scheduler-stp.patch
@@ -0,0 +1,109 @@
+scheduler.stp: Handle missing symbols.
+
+Compiler output code optimization leads to missing debug data for some
+target variables, in particular some inline functions parameters, e.g.
+context_switch.
+
+Handle this by testing for variable name resolvability and provide default
+variable values in case no suitable target data is available through variable
+name. Affected functions: ctxswitch,wakeup.
+
+This fix does not affect the intended context switch tracing.
+
+
+Upstream-Status: Pending
+
+Signed-off-by: George Nita <george.nita@enea.com>
+
+
+diff --git a/tapset/linux/scheduler.stp b/tapset/linux/scheduler.stp
+index 7596a46..539a0f1 100644
+--- a/tapset/linux/scheduler.stp
++++ b/tapset/linux/scheduler.stp
+@@ -120,7 +120,7 @@ probe scheduler.ctxswitch = kernel.trace("sched_switch") !,
+ %( arch != "x86_64" && arch != "ia64" && arch != "arm" %?
+        kernel.function("__switch_to")
+ %:
+-       kernel.function("context_switch")
++       kernel.function("prepare_task_switch")
+ %)
+ {
+        name = "ctxswitch"
+@@ -140,7 +140,7 @@ probe scheduler.ctxswitch = kernel.trace("sched_switch") !,
+                prev_task_name = task_execname($prev_p)
+                prevtsk_state = $prev_p->state
+        }
+-       else {
++       else if (@defined($prev)) {
+                prev_priority = $prev->prio
+                prev_pid = $prev->tgid
+                prev_tid = $prev->pid
+@@ -148,6 +148,15 @@ probe scheduler.ctxswitch = kernel.trace("sched_switch") !,
+                prev_task_name = task_execname($prev)
+                prevtsk_state = $prev->state
+        }
++       else {
++               prev_priority = 0
++               prev_pid = 0
++               prev_tid = 0
++               /* No prev_task, dummy */
++               prev_task = task_current()
++               prev_task_name = "UNAVAILABLE"
++               prevtsk_state = 0
++       }
+ 
+        if (@defined($next)) {
+                next_priority = $next->prio
+@@ -165,7 +174,7 @@ probe scheduler.ctxswitch = kernel.trace("sched_switch") !,
+                next_task_name = task_execname($next_p)
+                nexttsk_state = $next_p->state
+        }
+-       else {
++       else if (@defined($new)) {
+                next_priority = $new->prio
+                next_pid = $new->tgid
+                next_tid = $new->pid
+@@ -173,6 +182,14 @@ probe scheduler.ctxswitch = kernel.trace("sched_switch") !,
+                next_task_name = task_execname($new)
+                nexttsk_state = $new->state
+        }
++       else {
++               next_task = task_current()
++               next_priority = task_prio(next_task)
++               next_pid = task_pid(next_task)
++               next_tid = task_tid(next_task)
++               next_task_name = task_execname(next_task)
++               nexttsk_state = task_state(next_task)
++       }
+ }
+ 
+ 
+@@ -254,12 +271,22 @@ probe scheduler.wakeup =
+        kernel.function("try_to_wake_up")
+ {
+        name = "wakeup"
+-       task = $p
+-       task_pid = $p->tgid
+-       task_tid = $p->pid
+-       task_priority = $p->prio
+-       task_cpu = task_cpu($p)
+-       task_state = task_state($p)
++       if (@defined($p)) {
++               task = $p
++               task_pid = $p->tgid
++               task_tid = $p->pid
++               task_priority = $p->prio
++               task_cpu = task_cpu($p)
++               task_state = task_state($p)
++       }
++       else {
++               task = task_current()
++               task_pid = task_pid(task)
++               task_tid = task_tid(task)
++               task_priority = task_prio(task)
++               task_cpu = task_cpu(task)
++               task_state = task_state(task)
++       }
+ }
+ 
+ /**
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
new file mode 100644
index 0000000000..488d417150
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Linux"
+
+require systemtap_git.inc
+
+DEPENDS = "elfutils sqlite3 systemtap-native"
+DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
+DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
+
+RDEPENDS_${PN} += "python bash"
+RDEPENDS_${PN}_class-native += "python-native"
+RDEPENDS_${PN}_class-nativesdk += "python-native"
+
+EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
+            --without-nss --without-avahi --without-dyninst \
+            --disable-server --disable-grapher --enable-prologues \
+            ac_cv_prog_have_javac=no \
+            ac_cv_prog_have_jar=no "
+
+STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
+
+EXTRA_OECONF += "${STAP_DOCS} "
+
+inherit autotools gettext pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
new file mode 100644
index 0000000000..e5f4da9830
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -0,0 +1,28 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+SRCREV = "ae91e3d552aff4f0e74662d055dae06ea55eb6bc"
+PV = "2.5+git${SRCPV}"
+
+SRC_URI = "git://sourceware.org/git/systemtap.git \
+           file://docproc-build-fix.patch \
+           file://obsolete_automake_macros.patch \
+           file://scheduler-stp.patch \
+          "
+
+FILESPATH = "${FILE_DIRNAME}/systemtap"
+
+# systemtap doesn't support mips
+COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
+
+S = "${WORKDIR}/git"
+
+# systemtap can't be built without optimization, if someone tries to compile an
+# entire image as -O0, we override it with -O2 here and give a note about it.
+def get_optimization(d):
+    selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
+    if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
+        bb.note("systemtap can't be built with -O0, -O2 will be used instead.")
+        return selected_optimization.replace("-O0", "-O2")
+    return selected_optimization
+
+SELECTED_OPTIMIZATION := "${@get_optimization(d)}"