[1/5] binutils: Convert SRC_URI and SRCREV to weak defines

Message ID 6eb7d501a2a8422cf0ee6a36bb99143f39255be3.1510192517.git.raj.khem@gmail.com
State New
Headers show
Series
  • Misc fixes predominantly for musl
Related show

Commit Message

Khem Raj Nov. 9, 2017, 1:58 a.m.
This makes it easy to override them in bbappends

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta/recipes-devtools/binutils/binutils-2.29.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.15.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Ross Burton Nov. 9, 2017, 8:54 p.m. | #1
How does this help?  A bbappend is parsed after the bb so it can just
assign to SRCREV.

Also is it actually useful to change the git url but apply the same patches?

Ross

On 9 November 2017 at 01:58, Khem Raj <raj.khem@gmail.com> wrote:

> This makes it easy to override them in bbappends

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  meta/recipes-devtools/binutils/binutils-2.29.inc | 5 +++--

>  1 file changed, 3 insertions(+), 2 deletions(-)

>

> diff --git a/meta/recipes-devtools/binutils/binutils-2.29.inc

> b/meta/recipes-devtools/binutils/binutils-2.29.inc

> index 27d46eb088..35f76cba6d 100644

> --- a/meta/recipes-devtools/binutils/binutils-2.29.inc

> +++ b/meta/recipes-devtools/binutils/binutils-2.29.inc

> @@ -18,9 +18,10 @@ BINUPV = "${@binutils_branch_version(d)}"

>

>  UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"

>

> -SRCREV = "37e991bb143ca2106330bcdc625590d53838b7a1"

> +SRCREV ?= "37e991bb143ca2106330bcdc625590d53838b7a1"

> +BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=

> binutils-${BINUPV}-branch;protocol=git"

>  SRC_URI = "\

> -     git://sourceware.org/git/binutils-gdb.git;branch=

> binutils-${BINUPV}-branch;protocol=git \

> +     ${BINUTILS_GIT_URI} \

>       file://0003-configure-widen-the-regexp-for-SH-architectures.patch \

>       file://0004-Point-scripts-location-to-libdir.patch \

>       file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch

> \

> --

> 2.15.0

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>
<div dir="ltr">How does this help?  A bbappend is parsed after the bb so it can just assign to SRCREV.<div><br></div><div>Also is it actually useful to change the git url but apply the same patches?</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 9 November 2017 at 01:58, Khem Raj <span dir="ltr">&lt;<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This makes it easy to override them in bbappends<br>
<br>
Signed-off-by: Khem Raj &lt;<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>&gt;<br>

---<br>
 meta/recipes-devtools/<wbr>binutils/binutils-2.29.inc | 5 +++--<br>
 1 file changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/meta/recipes-devtools/<wbr>binutils/binutils-2.29.inc b/meta/recipes-devtools/<wbr>binutils/binutils-2.29.inc<br>
index 27d46eb088..35f76cba6d 100644<br>
--- a/meta/recipes-devtools/<wbr>binutils/binutils-2.29.inc<br>
+++ b/meta/recipes-devtools/<wbr>binutils/binutils-2.29.inc<br>
@@ -18,9 +18,10 @@ BINUPV = &quot;${@binutils_branch_version(d)<wbr>}&quot;<br>
<br>
 UPSTREAM_CHECK_GITTAGREGEX = &quot;binutils-(?P&lt;pver&gt;\d+_(\d_?)*<wbr>)&quot;<br>
<br>
-SRCREV = &quot;<wbr>37e991bb143ca2106330bcdc625590<wbr>d53838b7a1&quot;<br>
+SRCREV ?= &quot;<wbr>37e991bb143ca2106330bcdc625590<wbr>d53838b7a1&quot;<br>
+BINUTILS_GIT_URI ?= &quot;git://<a href="http://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" rel="noreferrer" target="_blank">sourceware.org/git/<wbr>binutils-gdb.git;branch=<wbr>binutils-${BINUPV}-branch;<wbr>protocol=git</a>&quot;<br>
 SRC_URI = &quot;\<br>
-     git://<a href="http://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" rel="noreferrer" target="_blank">sourceware.org/git/<wbr>binutils-gdb.git;branch=<wbr>binutils-${BINUPV}-branch;<wbr>protocol=git</a> \<br>
+     ${BINUTILS_GIT_URI} \<br>
      file://0003-configure-widen-<wbr>the-regexp-for-SH-<wbr>architectures.patch \<br>
      file://0004-Point-scripts-<wbr>location-to-libdir.patch \<br>
      file://0005-Only-generate-an-<wbr>RPATH-entry-if-LD_RUN_PATH-is-<wbr>not-e.patch \<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.15.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Nov. 9, 2017, 10:49 p.m. | #2
On Thu, Nov 9, 2017 at 12:54 PM, Burton, Ross <ross.burton@intel.com> wrote:
> How does this help?  A bbappend is parsed after the bb so it can just assign

> to SRCREV.

>

> Also is it actually useful to change the git url but apply the same patches?

>


yes, this helps with using local forks of upstream and at the same
time apply the
patches from OE-Core being on same version. Especially for new archirectures
where all support may not be upstream.

> Ross

>

> On 9 November 2017 at 01:58, Khem Raj <raj.khem@gmail.com> wrote:

>>

>> This makes it easy to override them in bbappends

>>

>> Signed-off-by: Khem Raj <raj.khem@gmail.com>

>> ---

>>  meta/recipes-devtools/binutils/binutils-2.29.inc | 5 +++--

>>  1 file changed, 3 insertions(+), 2 deletions(-)

>>

>> diff --git a/meta/recipes-devtools/binutils/binutils-2.29.inc

>> b/meta/recipes-devtools/binutils/binutils-2.29.inc

>> index 27d46eb088..35f76cba6d 100644

>> --- a/meta/recipes-devtools/binutils/binutils-2.29.inc

>> +++ b/meta/recipes-devtools/binutils/binutils-2.29.inc

>> @@ -18,9 +18,10 @@ BINUPV = "${@binutils_branch_version(d)}"

>>

>>  UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"

>>

>> -SRCREV = "37e991bb143ca2106330bcdc625590d53838b7a1"

>> +SRCREV ?= "37e991bb143ca2106330bcdc625590d53838b7a1"

>> +BINUTILS_GIT_URI ?=

>> "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git"

>>  SRC_URI = "\

>> -

>> git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git

>> \

>> +     ${BINUTILS_GIT_URI} \

>>       file://0003-configure-widen-the-regexp-for-SH-architectures.patch \

>>       file://0004-Point-scripts-location-to-libdir.patch \

>>

>> file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \

>> --

>> 2.15.0

>>

>> --

>> _______________________________________________

>> Openembedded-core mailing list

>> Openembedded-core@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>

>

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.29.inc b/meta/recipes-devtools/binutils/binutils-2.29.inc
index 27d46eb088..35f76cba6d 100644
--- a/meta/recipes-devtools/binutils/binutils-2.29.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.29.inc
@@ -18,9 +18,10 @@  BINUPV = "${@binutils_branch_version(d)}"
 
 UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
 
-SRCREV = "37e991bb143ca2106330bcdc625590d53838b7a1"
+SRCREV ?= "37e991bb143ca2106330bcdc625590d53838b7a1"
+BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git"
 SRC_URI = "\
-     git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
+     ${BINUTILS_GIT_URI} \
      file://0003-configure-widen-the-regexp-for-SH-architectures.patch \
      file://0004-Point-scripts-location-to-libdir.patch \
      file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \