Message ID | 20211206124721.3899116-1-ross.burton@arm.com |
---|---|
State | Accepted, archived |
Commit | 726d6d77b4ec6034ba80974dcd291bac9720236d |
Headers | show |
Series | tcf-agent: cleanup patches | expand |
On Mon, Dec 6, 2021 at 4:47 AM Ross Burton <ross@burtonini.com> wrote: > > 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. > not totally useless. This patch is still useful when using llvm-ar and llvm-ranlib see https://errors.yoctoproject.org/Errors/Details/618826/ > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > .../tcf-agent/tcf-agent/fix_ranlib.patch | 17 ----------------- > .../tcf-agent/tcf-agent/ldflags.patch | 6 +++++- > .../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 > > 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..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 <ross.burton@arm.com> > > From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 > From: 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}" > > UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\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 \ > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#159226): https://lists.openembedded.org/g/openembedded-core/message/159226 > Mute This Topic: https://lists.openembedded.org/mt/87538834/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Dec 6, 2021 at 4:47 AM Ross Burton <ross@burtonini.com> wrote: > > 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. this works with gcc-ranlib wrapper only which expands $@ shell array, but it will fail if RANLIB was set to <cross>-ranlib or <cross>-llvn-ranlib has same behaviour so IMO this patch should be kept for portability reasons. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > .../tcf-agent/tcf-agent/fix_ranlib.patch | 17 ----------------- > .../tcf-agent/tcf-agent/ldflags.patch | 6 +++++- > .../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 > > 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..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 <ross.burton@arm.com> > > From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 > From: 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}" > > UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\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 \ > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#159226): https://lists.openembedded.org/g/openembedded-core/message/159226 > Mute This Topic: https://lists.openembedded.org/mt/87538834/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Dec 6, 2021 at 10:43 PM Khem Raj <raj.khem@gmail.com> wrote: > > On Mon, Dec 6, 2021 at 4:47 AM Ross Burton <ross@burtonini.com> wrote: > > > > 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. > > this works with gcc-ranlib wrapper only which expands $@ shell array, > but it will fail if RANLIB was set to <cross>-ranlib or > <cross>-llvn-ranlib has same behaviour > so IMO this patch should be kept for portability reasons. I have addressed it for llvm-ranlib in meta-clang, so it does not bother me as much if someone is not using gcc-ranlib or llvm-ranlib then it might be a problem but perhaps they will have to reason why they want to use bare ranlib > > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > --- > > .../tcf-agent/tcf-agent/fix_ranlib.patch | 17 ----------------- > > .../tcf-agent/tcf-agent/ldflags.patch | 6 +++++- > > .../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 > > > > 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..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 <ross.burton@arm.com> > > > > From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 > > From: 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}" > > > > UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\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 \ > > -- > > 2.25.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#159226): https://lists.openembedded.org/g/openembedded-core/message/159226 > > Mute This Topic: https://lists.openembedded.org/mt/87538834/1997914 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
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..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 <ross.burton@arm.com> From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 From: 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}" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\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 \
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. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../tcf-agent/tcf-agent/fix_ranlib.patch | 17 ----------------- .../tcf-agent/tcf-agent/ldflags.patch | 6 +++++- .../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