diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 22:31:25 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 19:43:26 +0300 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-devtools/tcf-agent | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.xz |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/tcf-agent')
6 files changed, 0 insertions, 225 deletions
diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch deleted file mode 100644 index 5f93c46f2..000000000 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Jan 2016 22:37:48 +0000 -Subject: [PATCH] canonicalize_file_name is specific to glibc - -When on Linux and not using glibc then we need to define -canonicalize_file_name() API, therefore add a check for finding out if -its not glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - agent/tcf/framework/mdep.c | 2 +- - agent/tcf/framework/mdep.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c -index 2b52ca8..7d09655 100644 ---- a/agent/tcf/framework/mdep.c -+++ b/agent/tcf/framework/mdep.c -@@ -1042,7 +1042,7 @@ char * canonicalize_file_name(const char * path) { - return strdup(res); - } - --#elif defined(__UCLIBC__) -+#elif defined(__UCLIBC__) || !defined(__GLIBC__) - - char * canonicalize_file_name(const char * path) { - return realpath(path, NULL); -diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h -index 1e718a2..187c399 100644 ---- a/agent/tcf/framework/mdep.h -+++ b/agent/tcf/framework/mdep.h -@@ -276,7 +276,7 @@ extern int loc_clock_gettime(int, struct timespec *); - - #define O_BINARY 0 - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || !defined(__GLIBC__) - # define O_LARGEFILE 0 - extern char ** environ; - extern char * canonicalize_file_name(const char * path); --- -2.7.0 - diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch deleted file mode 100644 index 5d704567c..000000000 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch +++ /dev/null @@ -1,14 +0,0 @@ -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) diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch deleted file mode 100644 index c03c55d22..000000000 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Pending - -From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 -From: Abdur Rehman <abdur_rehman@mentor.com> -Date: Wed, 26 Aug 2015 19:18:11 +0500 -Subject: [PATCH] tcf-agent: obey LDFLAGS - -Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com> ---- - Makefile.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 959028f..3148942 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -96,7 +96,7 @@ NO_LINK_F ?= -c - # Linker definition and flags - - LINK ?= $(CC) --LINK_FLAGS ?= $(CFLAGS) -+LINK_FLAGS ?= $(LDFLAGS) $(CFLAGS) - LINK_OUT_F ?= $(OUT_OBJ_F) - - # Archiver definition and flags --- -1.7.9.5 - diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init deleted file mode 100755 index 6303280aa..000000000 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: tcf-agent -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Target Communication Framework agent -### END INIT INFO - -DAEMON_PATH=/usr/sbin/tcf-agent -DAEMON_NAME=`basename $DAEMON_PATH` - -. /etc/init.d/functions - -test -x $DAEMON_PATH || exit 0 - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -export PATH - -RETVAL=0 - -case "$1" in - start) - echo -n "Starting $DAEMON_NAME: " - $DAEMON_PATH -d -L- -l0 - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - touch /var/lock/subsys/$DAEMON_NAME - else - echo "FAIL" - fi - ;; - - stop) - echo -n "Stopping $DAEMON_NAME: " - count=0 - while [ -n "`/bin/pidof $DAEMON_PATH`" -a $count -lt 10 ] ; do - killproc $DAEMON_PATH >& /dev/null - sleep 1 - RETVAL=$? - if [ $RETVAL != 0 -o -n "`/bin/pidof $DAEMON_PATH`" ] ; then - sleep 3 - fi - count=`expr $count + 1` - done - rm -f /var/lock/subsys/$DAEMON_NAME - if [ -n "`/bin/pidof $DAEMON_PATH`" ] ; then - echo "FAIL" - else - echo "OK" - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - status $DAEMON_NAME - RETVAL=$? - ;; - - condrestart) - [ -f /var/lock/subsys/$DAEMON_NAME ] && $0 restart - ;; - - *) - echo "usage: $0 { start | stop | status | restart | condrestart | status }" - ;; -esac - -exit $RETVAL - diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service deleted file mode 100644 index fd9a6c4d5..000000000 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Target Communication Framework agent -After=network.target - -[Service] -Type=forking -ExecStart=@SBINDIR@/tcf-agent -d -L- -l0 - -[Install] -WantedBy=multi-user.target diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb deleted file mode 100644 index ab2fcd7ab..000000000 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Target Communication Framework for the Eclipse IDE" -HOMEPAGE = "http://wiki.eclipse.org/TCF" -BUGTRACKER = "https://bugs.eclipse.org/bugs/" - -LICENSE = "EPL-1.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" - -SRCREV = "b9a735e9c7cf82f80d412b7ab15d08b89d5a4ccc" -PV = "1.3.0+git${SRCPV}" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" -SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \ - file://fix_ranlib.patch \ - file://ldflags.patch \ - file://0001-canonicalize_file_name-is-specific-to-glibc.patch;striplevel=2 \ - file://tcf-agent.init \ - file://tcf-agent.service \ - " - -DEPENDS = "util-linux openssl" -RDEPENDS_${PN} = "bash" - -S = "${WORKDIR}/git/agent" - -inherit update-rc.d systemd - -SYSTEMD_SERVICE_${PN} = "tcf-agent.service" - -INITSCRIPT_NAME = "tcf-agent" -INITSCRIPT_PARAMS = "start 99 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,`" - -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_install() { - oe_runmake install INSTALLROOT=${D} - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tcf-agent.service -} - |