diff options
author | Armin Kuster <akuster808@gmail.com> | 2021-04-13 07:22:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-18 11:37:26 +0100 |
commit | 190a53a942ea2e87621eba159e94f5f5e67b5fc5 (patch) | |
tree | 2d2e73f3086f65ea1d8abc550b294e9a9694cae1 /meta/recipes-devtools/binutils | |
parent | a24d0161f6b511f2c62ef6a36bf966ad04df34a5 (diff) | |
download | poky-190a53a942ea2e87621eba159e94f5f5e67b5fc5.tar.gz |
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.
(From OE-Core rev: 40d18272cd765420080fffc0e4bde7e3e79982af)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
--
V2]
Remove commented out BINUPV and function
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.36.inc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.36.inc b/meta/recipes-devtools/binutils/binutils-2.36.inc index 2968291889..d2ededb728 100644 --- a/meta/recipes-devtools/binutils/binutils-2.36.inc +++ b/meta/recipes-devtools/binutils/binutils-2.36.inc | |||
@@ -10,22 +10,16 @@ LIC_FILES_CHKSUM="\ | |||
10 | file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ | 10 | file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ |
11 | " | 11 | " |
12 | 12 | ||
13 | def binutils_branch_version(d): | ||
14 | pvsplit = d.getVar('PV').split('.') | ||
15 | return pvsplit[0] + "_" + pvsplit[1] | ||
16 | |||
17 | # When upgrading to 2.37, please make sure there is no trailing .0, so | 13 | # When upgrading to 2.37, please make sure there is no trailing .0, so |
18 | # that upstream version check can work correctly. | 14 | # that upstream version check can work correctly. |
19 | PV = "2.36.1" | 15 | PV = "2.36.1" |
20 | CVE_VERSION = "2.36.1" | 16 | CVE_VERSION = "2.36.1" |
21 | BINUPV = "${@binutils_branch_version(d)}" | 17 | SRCBRANCH ?= "binutils-2_36-branch" |
22 | #BRANCH = "binutils-${BINUPV}-branch" | ||
23 | BRANCH ?= "binutils-2_36-branch" | ||
24 | 18 | ||
25 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | 19 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" |
26 | 20 | ||
27 | SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" | 21 | SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" |
28 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" | 22 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" |
29 | SRC_URI = "\ | 23 | SRC_URI = "\ |
30 | ${BINUTILS_GIT_URI} \ | 24 | ${BINUTILS_GIT_URI} \ |
31 | file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ | 25 | file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ |