binutils: rename BRANCH var
PATCH 1/1 binutils: rename BRANCH var
If BRANCH is defined in local.conf then that name is used to d/l sources for binutils. You will get this error:
Fetcher failure for URL: 'git://sourceware.org/git/binutils-gdb.git;branch=hardknott;protocol=git'. Unable to fetch URL from any source.
Rename to SRCBRANCH like glibc has to avoid the more common variable name BRANCH.
--- meta/recipes-devtools/binutils/binutils-2.36.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/binutils/binutils-2.36.inc +3 -3
@@ -19,13 +19,13 @@ def binutils_branch_version(d): PV = "2.36.1" CVE_VERSION = "2.36.1" BINUPV = "${@binutils_branch_version(d)}" -#BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_36-branch" +#SRCBRANCH = "binutils-${BINUPV}-branch" +SRCBRANCH ?= "binutils-2_36-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" -BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" +BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ file://0004-configure-widen-the-regexp-for-SH-architectures.patch \
Signature · 1 line
2.17.1
Quoted 18 lines · akuster
If BRANCH is defined in local.conf then that name is used to d/l sources for binutils. You will get this error:
Fetcher failure for URL: '
git://sourceware.org/git/binutils-gdb.git;branch=hardknott;protocol=git'. Unable to fetch URL from any source.Rename to SRCBRANCH like glibc has to avoid the more common variable name BRANCH.
Signed-off-by Armin Kuster <[email protected]>--- meta/recipes-devtools/binutils/binutils-2.36.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-devtools/binutils/binutils-2.36.inc +0
-0
meta/recipes-devtools/binutils/binutils-2.36.inc def binutils_branch_version(d): · line 23
Quoted 7 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +2
-2@@ -19,13 +19,13 @@ def binutils_branch_version(d): PV = "2.36.1" CVE_VERSION = "2.36.1" BINUPV = "${@binutils_branch_version(d)}" -#BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_36-branch" +#SRCBRANCH = "binutils-${BINUPV}-branch" +SRCBRANCH ?= "binutils-2_36-branch"
if dropping to use BINUPV then lets drop setting this as well. Which also means you can dropbinutils_branch_version as well which is fine with me.
Quoted 15 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +1
-2UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" -BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" +BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ --2.17.1
Quoted 13 lines · Khem Raj
Quoted 12 lines · akuster
If BRANCH is defined in local.conf then that name is used to d/l sources for binutils. You will get this error:
Fetcher failure for URL: '
git://sourceware.org/git/binutils-gdb.git;branch=hardknott;protocol=git'. Unable to fetch URL from any source.Rename to SRCBRANCH like glibc has to avoid the more common variable name BRANCH.
Signed-off-by Armin Kuster <[email protected]>--- meta/recipes-devtools/binutils/binutils-2.36.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 14 lines
meta/recipes-devtools/binutils/binutils-2.36.inc def binutils_branch_version(d): · line 23
Quoted 12 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +2
-2@@ -19,13 +19,13 @@ def binutils_branch_version(d): PV = "2.36.1" CVE_VERSION = "2.36.1" BINUPV = "${@binutils_branch_version(d)}" -#BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_36-branch" +#SRCBRANCH = "binutils-${BINUPV}-branch" +SRCBRANCH ?= "binutils-2_36-branch"if dropping to use BINUPV then lets drop setting this as well. Which also means you can drop
i wasn't the one who dropped BINUPV. Those were already commented out via b71294c4de binutils: Upgrade to binutils 2.32
Quoted 1 line
binutils_branch_versionas well which is fine with me.
I can do V2 to clean that up.
-armin
Quoted 15 lines
Quoted 15 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +1
-2UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" -BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" +BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ --2.17.1
Quoted 34 lines · On Monday, April 12, 2021, akuster808 <[email protected]> wrote:
Quoted 5 lines · Khem Raj
Quoted 4 lines · akuster
If BRANCH is defined in local.conf then that name is used to d/l sources for binutils. You will get this error:
Fetcher failure for URL: '
git://sourceware.org/git/binutils-gdb.git;branch=hardknott;protocol=git'. Unable to fetch URL from any source.
Quoted 2 lines
Quoted 2 lines
Rename to SRCBRANCH like glibc has to avoid the more common variable
name BRANCH.
Quoted 7 lines
Review
Quoted 7 lines
Signed-off-by Armin Kuster <[email protected]>--- meta/recipes-devtools/binutils/binutils-2.36.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)(quoted diff) +0
-0b/meta/recipes-devtools/binutils/binutils-2.36.inc
Quoted 5 lines
Quoted 5 lines
index 2968291889..f638f02e8f 100644
meta/recipes-devtools/binutils/binutils-2.36.inc +0
-0@@ -19,13 +19,13 @@ def binutils_branch_version(d): PV = "2.36.1"Quoted 8 lines
meta/recipes-devtools/binutils/binutils-2.36.inc def binutils_branch_version(d): · line 23
Quoted 6 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +2
-2CVE_VERSION = "2.36.1" BINUPV = "${@binutils_branch_version(d)}" -#BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_36-branch" +#SRCBRANCH = "binutils-${BINUPV}-branch" +SRCBRANCH ?= "binutils-2_36-branch"if dropping to use BINUPV then lets drop setting this as well. Which also means you can drop
Quoted 9 lines
i wasn't the one who dropped BINUPV. Those were already commented out via
b71294c4debinutils: Upgrade to binutils 2.32Quoted 1 line
binutils_branch_versionas well which is fine with me.I can do V2 to clean that up.
That will be cool
Quoted 22 lines
-armin
Quoted 5 lines
meta/recipes-devtools/binutils/binutils-2.36.inc def binutils_branch_version(d):
Quoted 5 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +0
-1UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" -BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git"
Quoted 1 line
meta/recipes-devtools/binutils/binutils-2.36.inc def binutils_branch_version(d): · line 27
Quoted 1 line
meta/recipes-devtools/binutils/binutils-2.36.inc +1
-0+BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git"
Quoted 3 lines
meta/recipes-devtools/binutils/binutils-2.36.inc def binutils_branch_version(d):
Quoted 3 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +0
-0SRC_URI = "\ ${BINUTILS_GIT_URI} \ file://0004-configure-widen-the-regexp-for-SH-architectures.patch\
Quoted 6 lines
Quoted 6 lines
meta/recipes-devtools/binutils/binutils-2.36.inc +0
-1--2.17.1