From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...nonicalize_file_name-is-specific-to-glibc.patch | 46 +++++++++++++++ .../tcf-agent/tcf-agent/fix_ranlib.patch | 16 ++++++ .../tcf-agent/tcf-agent/ldflags.patch | 28 ++++++++++ .../tcf-agent/tcf-agent/tcf-agent.init | 65 ++++++++++++++++++++++ .../tcf-agent/tcf-agent/tcf-agent.service | 12 ++++ .../recipes-devtools/tcf-agent/tcf-agent_git.bb | 58 +++++++++++++++++++ 6 files changed, 225 insertions(+) create mode 100644 poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch create mode 100644 poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch create mode 100644 poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch create mode 100755 poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init create mode 100644 poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service create mode 100644 poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb (limited to 'poky/meta/recipes-devtools/tcf-agent') diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch new file mode 100644 index 0000000000..5f93c46f29 --- /dev/null +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch @@ -0,0 +1,46 @@ +From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- +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/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch new file mode 100644 index 0000000000..b66f41ad28 --- /dev/null +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch @@ -0,0 +1,16 @@ +Upstream-Status: Inappropriate [poky-specific fix] + +Index: agent/Makefile.inc +=================================================================== +--- agent.orig/Makefile.inc ++++ agent/Makefile.inc +@@ -88,6 +88,9 @@ ifneq ($(OPSYS),Windows) + ifneq ($(CC),g++) + OPTS += -Wmissing-prototypes + endif ++ ifneq ($(RANLIB),) ++ RANLIB += $@ ++ endif + endif + + # Compiler flags definition diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch new file mode 100644 index 0000000000..c03c55d22b --- /dev/null +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 +From: Abdur Rehman +Date: Wed, 26 Aug 2015 19:18:11 +0500 +Subject: [PATCH] tcf-agent: obey LDFLAGS + +Signed-off-by: Abdur Rehman +--- + 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/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init new file mode 100755 index 0000000000..f90208555b --- /dev/null +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init @@ -0,0 +1,65 @@ +#!/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: " + start-stop-daemon -K -q -x $DAEMON_PATH -s USR2 + 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/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service new file mode 100644 index 0000000000..a486ac7bad --- /dev/null +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service @@ -0,0 +1,12 @@ +[Unit] +Description=Target Communication Framework agent +After=network.target + +[Service] +Type=forking +ExecStart=@SBINDIR@/tcf-agent -d -L- -l0 +KillSignal=USR2 +SuccessExitStatus=USR2 + +[Install] +WantedBy=multi-user.target diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb new file mode 100644 index 0000000000..ba14c42698 --- /dev/null +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -0,0 +1,58 @@ +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 = "2dddd5f440a15d5406032fac20f206484513646f" +PV = "1.4.0+git${SRCPV}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" +SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent;branch=1.4_neon_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, | sed s,aarch64.*,a64,`" +MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" + +EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" + +LCL_STOP_SERVICES = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ + -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ + -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" + + +# These features don't compile for several cases. +# +CFLAGS_append_mips = " ${LCL_STOP_SERVICES}" +CFLAGS_append_mips64 = " ${LCL_STOP_SERVICES}" +CFLAGS_append_libc-musl = " ${LCL_STOP_SERVICES}" +CFLAGS_append_powerpc64 = " ${LCL_STOP_SERVICES}" + +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 +} + -- cgit v1.2.3