diff options
-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 \ |