diff options
Diffstat (limited to 'meta/recipes-devtools/tcf-agent')
| -rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 34 |
3 files changed, 37 insertions, 47 deletions
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch deleted file mode 100644 index abd33babeb..0000000000 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch +++ /dev/null @@ -1,17 +0,0 @@ -Actually pass the arguments to RANLIB. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -Index: agent/Makefile.inc -=================================================================== ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -92,6 +92,7 @@ ifeq ($(OPSYS),GNU/Linux) - OPTS += -DUSE_uuid_generate=0 - endif - OPTS += -DENABLE_arch_$(shell uname -m) -+ RANLIB += $@ - endif - - ifneq ($(OPSYS),Windows) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch index c03c55d22b..d701e8dec0 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch @@ -1,4 +1,8 @@ -Upstream-Status: Pending +We need LDFLAGS to be respected otherwise there are QA warnings as the right +flags don't get used. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Ross Burton <ross.burton@arm.com> From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 From: Abdur Rehman <abdur_rehman@mentor.com> @@ -6,23 +10,26 @@ Date: Wed, 26 Aug 2015 19:18:11 +0500 Subject: [PATCH] tcf-agent: obey LDFLAGS Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com> + +Rebased to 4a2c4baaccbc8c29ce0297705de9a4e096d57ce5 version + +Signed-off-by: Mark hatle <mark.hatle@amd.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 +Index: agent/Makefile.inc +=================================================================== +--- agent.orig/Makefile.inc ++++ agent/Makefile.inc +@@ -111,7 +111,7 @@ NO_LINK_F ?= -c # Linker definition and flags - LINK ?= $(CC) --LINK_FLAGS ?= $(CFLAGS) -+LINK_FLAGS ?= $(LDFLAGS) $(CFLAGS) - LINK_OUT_F ?= $(OUT_OBJ_F) + 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/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 854269a0fa..59b9d7de78 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -6,25 +6,24 @@ BUGTRACKER = "https://bugs.eclipse.org/bugs/" LICENSE = "EPL-1.0 | EDL-1.0" LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" -SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f" -PV = "1.7.0+git${SRCPV}" +SRCREV = "1f11747e83ebf4f53e8d17f430136f92ec378709" +PV = "1.8.0+git" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" -SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent \ - file://fix_ranlib.patch \ +SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \ file://ldflags.patch \ file://tcf-agent.init \ file://tcf-agent.service \ " DEPENDS = "util-linux openssl" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" S = "${WORKDIR}/git/agent" inherit update-rc.d systemd -SYSTEMD_SERVICE_${PN} = "tcf-agent.service" +SYSTEMD_SERVICE:${PN} = "tcf-agent.service" INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." @@ -42,21 +41,22 @@ LCL_STOP_SERVICES = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ # These features don't compile for several cases. # -CFLAGS_append_arc = " ${LCL_STOP_SERVICES}" -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}" -CFLAGS_append_powerpc64le = " ${LCL_STOP_SERVICES}" -CFLAGS_append_riscv64 = " ${LCL_STOP_SERVICES}" -CFLAGS_append_riscv32 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:arc = " ${LCL_STOP_SERVICES}" +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}" +CFLAGS:append:powerpc64le = " ${LCL_STOP_SERVICES}" +CFLAGS:append:riscv64 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:riscv32 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:loongarch64 = " ${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 + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service } |