Skip to contentSkip to conversation

upgrade tcf-agent to the latest stable revision 0.0+svnr1855

PATCH Applied Dexuan Cui 2 participants 4 messages Jul 22, 2011 – Jul 25, 2011

lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

v2 cover upgrade tcf-agent to the latest stable revision 0.0+svnr1855

Changes from the previous version:
1) add DEPENDS = "util-linux" to resolve the uuid.h issue

Quoted 1 line

fatal error: uuid/uuid.h: No such file or directory | compilation

2) add RDEPENDS_${PN} = "bash"
buxybox's sh doesn't work with tcf-agent, so we need bash.

3) update MAKE_OS:
MAKE_OS = echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux, e.g., for qemuarm, we need to change linux-gnueabi to GNU/Linux. This is necessary due to the new tcf-agent's Makefile's coding.

4) add
+# They don't build on ARM and we don't need them actually. +CFLAGS += "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \

+    -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \
+    -DSERVICE_StackTrace=0 -DSERVICE_Symbols=0 -DSERVICE_LineNumbers=0 \
+    -DSERVICE_Expressions=0"

Lianhao and Dexuan tested the v2 patches on qemux86, qemux86-64, qemuarm, qemuppc and qemumips with both incremental and full building, and runtime testings.

Thanks,
-- Lianhao and Dexuan

The following changes since commit 068839698fe192d8846c0ed4db65861448e8e524:

eglibc: fix runtime assertion failure (2011-07-13 12:34:30 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/tcf-agent
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/tcf-agent

Dexuan Cui (2):
tcf-agent: upgrade to the latest stable revision 0.0+svnr1855 distro_tracking_fields.inc: update the info for tcf-agent

 .../conf/distro/include/distro_tracking_fields.inc |   12 +-
 .../tcf-agent/tcf-agent/fix_ranlib.patch           |   14 +
 .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch   |   14 +-
 .../tcf-agent/tcf-agent/terminals_agent.patch      | 1027 --------------------
 meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb   |   32 +-
 5 files changed, 50 insertions(+), 1049 deletions(-)
 create mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
 delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH v2 1/2 tcf-agent: upgrade to the latest stable revision 0.0+svnr1855

---
 .../tcf-agent/tcf-agent/fix_ranlib.patch           |   14 +
 .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch   |   14 +-
 .../tcf-agent/tcf-agent/terminals_agent.patch      | 1027 --------------------
 meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb   |   32 +-
 4 files changed, 44 insertions(+), 1043 deletions(-)
 create mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
 delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch new file +14 -0
new file mode 100644
index 0000000..5d70456
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [poky-specific fix]
+
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -57,6 +57,9 @@
+   ifeq ($(NO_UUID),)
+     LIBS += -luuid
+   endif
++  ifneq ($(RANLIB),)
++    RANLIB += $@
++  endif
+ endif
+ 
+ ifneq ($(OPSYS),Windows)
meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch +7 -7
index 60b0b27..fefaf04 100644
@@ -2,15 +2,15 @@ Upstream-Status: Inappropriate [poky-specific script]
 
 --- a/Makefile
 +++ b/Makefile
-@@ -32,7 +32,7 @@
- 	install -d -m 755 $(INSTALLROOT)$(SBIN)
- 	install -d -m 755 $(INSTALLROOT)$(INIT)
+@@ -64,7 +64,7 @@
+ 	install -d -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/services
  	install -c $(BINDIR)/agent -m 755 $(INSTALLROOT)$(SBIN)/tcf-agent
--	install -c $(TCF_AGENT_DIR)/main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent
+ 	install -c $(BINDIR)/client -m 755 $(INSTALLROOT)$(SBIN)/tcf-client
+-	install -c main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent
 +	install -c tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent
- 
- clean:
- 	rm -rf $(BINDIR)
+ 	install -c config.h -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/config.h
+ 	install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/framework -m 644 framework/*.h
+ 	install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/services -m 644 services/*.h
 --- /dev/null
 +++ b/tcf-agent.init
 @@ -0,0 +1,78 @@
meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch deleted +0 -1027

1,027 lines not on this page · raw message

meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb +23 -9
index 96b4ce0..3f97f69 100644
@@ -1,20 +1,28 @@
 DESCRIPTION = "Target Communication Framework"
-HOMEPAGE = "http://dsdp.eclipse.org/dsdp/tm/"
+HOMEPAGE = "http://wiki.eclipse.org/TCF"
 BUGTRACKER = "https://bugs.eclipse.org/bugs/"
 
 LICENSE = "EPL-1 | EDLv1.0"
 LIC_FILES_CHKSUM = "file://../epl-v10.html;md5=7aa4215a330a0a4f6a1cbf8da1a0879f \
-                    file://../agent/edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
+                    file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
 
-SRCREV = "1078"
-PV = "0.3.0+svnr${SRCPV}"
+SRCREV = "1855"
+PV = "0.0+svnr${SRCPV}"
 PR = "r0"
 
-SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/;module=tags/0.3.0/;proto=http \
-           file://terminals_agent.patch \
-           file://fix_tcf-agent.init.patch"
+SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=agent;proto=http \
+           http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk/epl-v10.html;name=epl \
+           file://fix_ranlib.patch \
+           file://fix_tcf-agent.init.patch \
+          "
 
-S = "${WORKDIR}/tags/0.3.0/tcf-agent"
+SRC_URI[epl.md5sum] = "7aa4215a330a0a4f6a1cbf8da1a0879f"
+SRC_URI[epl.sha256sum] = "4fd64aeed340d62a64a8da4b371efe0f6d0d745f4d2dbefacba86c646d36bc72"
+
+DEPENDS = "util-linux"
+RDEPENDS_${PN} = "bash"
+
+S = "${WORKDIR}/agent"
 
 inherit update-rc.d
 
@@ -23,10 +31,16 @@ INITSCRIPT_PARAMS = "start 999 3 5 . stop 20 0 1 2 6 ."
 
 # mangling needed for make
 MAKE_ARCH = `echo ${TARGET_ARCH} | sed s,i.86,i686,`
-MAKE_OS = `echo ${TARGET_OS} | sed s,linux,GNU/Linux,`
+MAKE_OS = `echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`
 
 EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'"
 
+# They don't build on ARM and we don't need them actually.
+CFLAGS += "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \
+    -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \
+    -DSERVICE_StackTrace=0 -DSERVICE_Symbols=0 -DSERVICE_LineNumbers=0 \
+    -DSERVICE_Expressions=0"
+
 do_compile() {
 	oe_runmake
 }
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH v2 2/2 distro_tracking_fields.inc: update the info for tcf-agent

In reply to Dexuan Cui
---
 .../conf/distro/include/distro_tracking_fields.inc |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +6 -6
index efb4c0b..4de543e 100644
@@ -2781,17 +2781,17 @@ RECIPE_MAINTAINER_pn-latencytop = "Dexuan Cui <[email protected]>"
 RECIPE_STATUS_pn-tcf-agent = "green"
 DISTRO_PN_ALIAS_pn-tcf-agent = "WindRiver upstream=http://www.eclipse.org/dsdp/tm/"
 RECIPE_DEPENDENCY_CHECK_pn-tcf-agent = "not done"
-RECIPE_LATEST_VERSION_pn-tcf-agent = "0.3.0+svnr1078"
-RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "June 29, 2011"
-RECIPE_NO_UPDATE_REASON_pn-tcf-agent = "Do not upgrade to version: (998)? because upstraem hasn't defined a formal release tag."
+RECIPE_LATEST_VERSION_pn-tcf-agent = "0.0+svnr1855"
+RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "Jul 21, 2011"
+RECIPE_NO_UPDATE_REASON_pn-tcf-agent = "1855 is the latest stable revision"
 RECIPE_NO_OF_PATCHES_pn-tcf-agent = "2"
-RECIPE_PATCH_pn-tcf-agent+terminals_agent = "we might get the patch from git://git.yoctoproject.org/eclipse-poky.git in future"
 RECIPE_PATCH_pn-tcf-agent+fix_tcf-agent.init = "a proper script /etc/init.d/tcf-agent"
+RECIPE_PATCH_pn-tcf-agent+fix_ranlib = "need to pass arguments to RANLIB"
 RECIPE_INTEL_SECTION_pn-tcf-agent = "sdk-tools"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tcf-agent = "1+ years"
-RECIPE_LATEST_RELEASE_DATE_pn-tcf-agent = "07/2010"
+RECIPE_LATEST_RELEASE_DATE_pn-tcf-agent = "Jul 07, 2011"
 RECIPE_COMMENTS_pn-tcf-agent = ""
-RECIPE_LAST_UPDATE_pn-tcf-agent = "Jul 23, 2010"
+RECIPE_LAST_UPDATE_pn-tcf-agent = "Jul 21, 2011"
 RECIPE_MAINTAINER_pn-tcf-agent = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-liburcu = "green"
Signature · 1 line
1.7.6
Applied
#3 lore raw
In reply to Dexuan Cui
Quoted 38 lines · Dexuan Cui

Changes from the previous version:
1) add DEPENDS = "util-linux" to resolve the uuid.h issue

Quoted 1 line

fatal error: uuid/uuid.h: No such file or directory | compilation

2) add RDEPENDS_${PN} = "bash"
buxybox's sh doesn't work with tcf-agent, so we need bash.

3) update MAKE_OS:
MAKE_OS = echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux, e.g., for qemuarm, we need to change linux-gnueabi to GNU/Linux. This is necessary due to the new tcf-agent's Makefile's coding.

4) add

(quoted diff) +5 -0
+# They don't build on ARM and we don't need them actually.
+CFLAGS += "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \
+    -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \
+    -DSERVICE_StackTrace=0 -DSERVICE_Symbols=0 -DSERVICE_LineNumbers=0 \
+    -DSERVICE_Expressions=0"

Lianhao and Dexuan tested the v2 patches on qemux86, qemux86-64, qemuarm, qemuppc and qemumips with both incremental and full building, and runtime testings.

Thanks,
-- Lianhao and Dexuan

The following changes since commit 068839698fe192d8846c0ed4db65861448e8e524:

eglibc: fix runtime assertion failure (2011-07-13 12:34:30 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/tcf-agent
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/tcf-agent

Dexuan Cui (2):
tcf-agent: upgrade to the latest stable revision 0.0+svnr1855 distro_tracking_fields.inc: update the info for tcf-agent

Quoted 9 lines
  .../conf/distro/include/distro_tracking_fields.inc |   12 +-
  .../tcf-agent/tcf-agent/fix_ranlib.patch           |   14 +
  .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch   |   14 +-
  .../tcf-agent/tcf-agent/terminals_agent.patch      | 1027 --------------------
  meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb   |   32 +-
  5 files changed, 50 insertions(+), 1049 deletions(-)

create mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch

Merged into OE-Core

Thanks
Sau!