fixes to bug #412 and #856

PATCH In review Dexuan Cui 2 participants 4 messages May 3, 2011 – May 10, 2011

lore

Share & tools

lore

Dexuan Cui

author Applied

2011-05-03 14:06 UTC #0 lore raw

cover fixes to bug #412 and #856

From: Dexuan Cui <[email protected]>

[YOCTO #856]

    Commit 320a641df18024265c3d2b3b08251a231f9fd6a0 omitted the line when being

merged into master branch.

[YOCTO #412]
lttng-viewer: explicitly add linkage to lttvwindow. Without the fix, lttv-gui inside target can't run, complaining "undefined symbol: LTTV_VIEWER_CONSTRUCTORS".

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dcui/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/distro

Thanks,
Dexuan Cui <[email protected]>
---

Dexuan Cui (2):
task-core-tools.bb: properly enable lttng-ust for ARM
lttng-viewer: explicitly add linkage to lttvwindow

 meta/recipes-core/tasks/task-core-tools.bb         |    3 +-
 .../lttng-viewer/add_linkage_to_lttvwindow.patch   |   42 ++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb  |   10 +++--
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-03 14:06 UTC #1 lore raw

PATCH 1/2 task-core-tools.bb: properly enable lttng-ust for ARM

From: Dexuan Cui <[email protected]>

Fixes [YOCTO #856]

Commit 320a641df18024265c3d2b3b08251a231f9fd6a0 omitted the line when being merged into master branch.

Signed-off-by Dexuan Cui <[email protected]>

---
 meta/recipes-core/tasks/task-core-tools.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-core/tasks/task-core-tools.bb +2 -1

index 9b2a4ce..b2bf5ef 100644
@@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r9"
+PR = "r10"
 
 PACKAGES = "\
     task-core-tools-debug \

@@ -63,6 +63,7 @@ RRECOMMENDS_task-core-tools-profile = "\
 RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap"
 RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap"
 RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap"
+RDEPENDS_task-core-tools-profile_append_qemuarm = " lttng-ust"
 RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap"
 RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap"

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-03 14:06 UTC #2 lore raw

PATCH 2/2 lttng-viewer: explicitly add linkage to lttvwindow

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Fixes [YOCTO #412]

Also update FILES_${PN}.

Signed-off-by Dexuan Cui <[email protected]>

---
 .../lttng-viewer/add_linkage_to_lttvwindow.patch   |   42 ++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb  |   10 +++--
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch

meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch new file +42 -0

new file mode 100644
index 0000000..4a135df
@@ -0,0 +1,42 @@
+Upstream-Status: Inappropriate [configuration]
+
+Explicitly add linkage to lttvwindow.
+
+Without the fix, lttv-gui inside target can't run, complaining
+"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
+
+Tue May  3 21:39:37 CST 2011
+
+Signed-off-by: Dexuan Cui <[email protected]>
+
+diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
+index ce50113..89083aa 100644
+--- a/lttv/modules/gui/common.am
++++ b/lttv/modules/gui/common.am
+@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
+ 
+ libdir = ${lttvplugindir}
+ 
++LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
+diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
+index c953fc9..489d640 100644
+--- a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
++++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
+@@ -1,13 +1,14 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-include ../../common.am
+-
+ INCLUDES = \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	$(DEFAULT_INCLUDES)
+ 
+-#libdir = ${lttvplugindir}
++AM_CFLAGS = $(MODULE_CFLAGS)
++AM_LDFLAGS = $(MODULE_LDFLAGS)
++
++libdir = ${lttvplugindir}
+ 
+ lib_LTLIBRARIES = liblttvwindow.la
+

meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb +6 -4

index b8f2f2c..5e7bd4c 100644
@@ -9,14 +9,16 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f650d5f5af1e9648fe0b40e290d3adbb \
                     file://ltt/ltt.h;beginline=2;endline=18;md5=8b7da9190028c50396d97fc85bad0da9 \
                     file://lttv/lttv/traceset.c;beginline=2;endline=17;md5=bcab42863b64b41d153bf81bbe2490a6"
-PR = "r0"
+PR = "r1"
+
 DEPENDS = "gtk+ pango popt"
 
 SECTION = "devel"
 
 ALTNAME = "lttv-${PV}-21032011"
 
-SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz"
+SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz \
+           file://add_linkage_to_lttvwindow.patch"
 
 SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d"
 SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647"

@@ -29,7 +31,7 @@ LEAD_SONAME = "liblttvtraceread*"
 FILES_${PN} += "\
     ${libdir}/liblttvtraceread*.so \
     ${libdir}/lttv/plugins/*.so \
-    ${datadir}/LinuxTraceToolkitViewer/facilities/* \
-    ${datadir}/LinuxTraceToolkitViewer/pixmaps/* "
+    ${datadir}/lttv/facilities/* \
+    ${datadir}/lttv/pixmaps/* "
 FILES_${PN}-dbg += "${libdir}/lttv/plugins/.debug/"

Signature · 1 line

1.7.2

Saul Wold

2011-05-10 17:18 UTC #3 lore raw

In reply to Dexuan Cui

Quoted 24 lines · Dexuan Cui

From: Dexuan Cui<[email protected]>
[YOCTO #856]
     Commit 320a641df18024265c3d2b3b08251a231f9fd6a0 omitted the line when being
merged into master branch.
[YOCTO #412]
lttng-viewer: explicitly add linkage to lttvwindow. Without the fix, lttv-gui inside target can't run, complaining "undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dcui/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/distro
Thanks,
Dexuan Cui<[email protected]>
---
Dexuan Cui (2):
task-core-tools.bb: properly enable lttng-ust for ARM
lttng-viewer: explicitly add linkage to lttvwindow

Quoted 6 lines

  meta/recipes-core/tasks/task-core-tools.bb         |    3 +-
  .../lttng-viewer/add_linkage_to_lttvwindow.patch   |   42 ++++++++++++++++++++
  meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb  |   10 +++--
  3 files changed, 50 insertions(+), 5 deletions(-)

create mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch

Pulled into core and master and staged for bernard

Thanks
Sau!