mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

binutils: rename BRANCH var

Browse Source 
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>
This commit is contained in:
Armin Kuster
2021-04-13 07:22:45 -07:00
committed by Richard Purdie
parent a24d0161f6
commit 190a53a942
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-devtools/binutils/binutils-2.36.inc
View File

@@ -10,22 +10,16 @@ LIC_FILES_CHKSUM="\
file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
" "
def binutils_branch_version(d):
pvsplit = d.getVar('PV').split('.')
return pvsplit[0] + "_" + pvsplit[1]
# When upgrading to 2.37, please make sure there is no trailing .0, so # When upgrading to 2.37, please make sure there is no trailing .0, so
# that upstream version check can work correctly. # that upstream version check can work correctly.
PV = "2.36.1" PV = "2.36.1"
CVE_VERSION = "2.36.1" CVE_VERSION = "2.36.1"
BINUPV = "${@binutils_branch_version(d)}" SRCBRANCH ?= "binutils-2_36-branch"
#BRANCH = "binutils-${BINUPV}-branch"
BRANCH ?= "binutils-2_36-branch"
UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" 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 = "\ SRC_URI = "\
${BINUTILS_GIT_URI} \ ${BINUTILS_GIT_URI} \
file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ file://0004-configure-widen-the-regexp-for-SH-architectures.patch \