summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-12-06 12:47:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-08 20:22:10 +0000
commitd8b7e5fe1dd438291cac4dc6c6afec97688c450b (patch)
tree971d817f688ad9454c85d1b71fca4a97a1fff2a2 /meta
parentd83fe4083570bb6e4773d1bf11127f961004b6da (diff)
downloadpoky-d8b7e5fe1dd438291cac4dc6c6afec97688c450b.tar.gz
tcf-agent: cleanup patches
ldflags.patch isn't really suitable for upstream, so mark inappropriate. fix_ranlib.patch has been rebased into uselessness over time, it's now setting RANLIB to just '$@' which expands to '' when called, so is a null operation. (From OE-Core rev: 726d6d77b4ec6034ba80974dcd291bac9720236d) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch17
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch6
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_git.bb1
3 files changed, 5 insertions, 19 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 @@
1Actually pass the arguments to RANLIB.
2
3Upstream-Status: Pending
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6Index: agent/Makefile.inc
7===================================================================
8--- a/Makefile.inc
9+++ b/Makefile.inc
10@@ -92,6 +92,7 @@ ifeq ($(OPSYS),GNU/Linux)
11 OPTS += -DUSE_uuid_generate=0
12 endif
13 OPTS += -DENABLE_arch_$(shell uname -m)
14+ RANLIB += $@
15 endif
16
17 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..dfe492091c 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 @@
1Upstream-Status: Pending 1We need LDFLAGS to be respected otherwise there are QA warnings as the right
2flags don't get used.
3
4Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@arm.com>
2 6
3From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 7From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001
4From: Abdur Rehman <abdur_rehman@mentor.com> 8From: Abdur Rehman <abdur_rehman@mentor.com>
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index d6d563d8e7..0d627f4e23 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -11,7 +11,6 @@ PV = "1.7.0+git${SRCPV}"
11 11
12UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 12UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
13SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \ 13SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \
14 file://fix_ranlib.patch \
15 file://ldflags.patch \ 14 file://ldflags.patch \
16 file://tcf-agent.init \ 15 file://tcf-agent.init \
17 file://tcf-agent.service \ 16 file://tcf-agent.service \