diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2015-09-17 10:21:26 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:20 +0100 |
| commit | 6d68ba98f34260d140b7b240838b8213625d4305 (patch) | |
| tree | 1f3bd753f15c89feab70bd6de892f9a948b967cc | |
| parent | c5aab3f63ec015d95993a4185b77c9476e170c2e (diff) | |
| download | poky-6d68ba98f34260d140b7b240838b8213625d4305.tar.gz | |
glibc/mmc-utils: Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
The 'BRANCH' variable name has no explicit relation with the
SRC_URI. Using 'SRCBRANCH' makes it more obvious and easier to
identify.
This patch makes the use consistent across the metadata.
(From OE-Core rev: ed86bf9c327ceda3976e799ca453028382f277a7)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glibc/cross-localedef-native_2.22.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.22.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils_git.bb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.22.bb b/meta/recipes-core/glibc/cross-localedef-native_2.22.bb index 2153ece0e2..03be9c0401 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.22.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.22.bb | |||
| @@ -14,10 +14,10 @@ inherit autotools | |||
| 14 | 14 | ||
| 15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" | 15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" |
| 16 | 16 | ||
| 17 | BRANCH ?= "release/${PV}/master" | 17 | SRCBRANCH ?= "release/${PV}/master" |
| 18 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" | 18 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" |
| 19 | 19 | ||
| 20 | SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \ | 20 | SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ |
| 21 | git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ | 21 | git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ |
| 22 | file://fix_for_centos_5.8.patch \ | 22 | file://fix_for_centos_5.8.patch \ |
| 23 | ${EGLIBCPATCHES} \ | 23 | ${EGLIBCPATCHES} \ |
diff --git a/meta/recipes-core/glibc/glibc_2.22.bb b/meta/recipes-core/glibc/glibc_2.22.bb index 09f0428ea2..020e417dd5 100644 --- a/meta/recipes-core/glibc/glibc_2.22.bb +++ b/meta/recipes-core/glibc/glibc_2.22.bb | |||
| @@ -9,11 +9,11 @@ DEPENDS += "gperf-native kconfig-frontends-native" | |||
| 9 | 9 | ||
| 10 | SRCREV ?= "a34d1c6afc86521d6ad17662a3b5362d8481514c" | 10 | SRCREV ?= "a34d1c6afc86521d6ad17662a3b5362d8481514c" |
| 11 | 11 | ||
| 12 | BRANCH ?= "release/${PV}/master" | 12 | SRCBRANCH ?= "release/${PV}/master" |
| 13 | 13 | ||
| 14 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" | 14 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" |
| 15 | 15 | ||
| 16 | SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \ | 16 | SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ |
| 17 | file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \ | 17 | file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \ |
| 18 | file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ | 18 | file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ |
| 19 | file://0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ | 19 | file://0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ |
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index 8950360934..546f7f2160 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb | |||
| @@ -3,12 +3,12 @@ HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/" | |||
| 3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
| 4 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" | 4 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" |
| 5 | 5 | ||
| 6 | BRANCH ?= "master" | 6 | SRCBRANCH ?= "master" |
| 7 | SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189" | 7 | SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189" |
| 8 | 8 | ||
| 9 | PV = "0.1" | 9 | PV = "0.1" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${BRANCH} \ | 11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \ |
| 12 | file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" | 12 | file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" |
| 13 | 13 | ||
| 14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
