From d8b7e5fe1dd438291cac4dc6c6afec97688c450b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Dec 2021 12:47:21 +0000 Subject: 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 Signed-off-by: Richard Purdie --- .../tcf-agent/tcf-agent/fix_ranlib.patch | 17 ----------------- meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch | 6 +++++- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 - 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch (limited to 'meta/recipes-devtools/tcf-agent') 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 - -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..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 @@ -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 +Signed-off-by: Ross Burton From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 From: Abdur Rehman 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}" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \ - file://fix_ranlib.patch \ file://ldflags.patch \ file://tcf-agent.init \ file://tcf-agent.service \ -- cgit v1.2.3-54-g00ecf