All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
@ 2015-09-17 13:21 Otavio Salvador
  2015-09-17 13:30 ` Gary Thomas
  2015-09-17 13:54 ` Khem Raj
  0 siblings, 2 replies; 6+ messages in thread
From: Otavio Salvador @ 2015-09-17 13:21 UTC (permalink / raw)
  To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador

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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2:
- Use SRCBRANCH instead of SRC_BRANCH (Khem)

 meta/recipes-core/glibc/cross-localedef-native_2.22.bb | 4 ++--
 meta/recipes-core/glibc/glibc_2.22.bb                  | 4 ++--
 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 2153ece..03be9c0 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
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
 
-BRANCH ?= "release/${PV}/master"
+SRCBRANCH ?= "release/${PV}/master"
 GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
 
-SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
+SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
            file://fix_for_centos_5.8.patch \
            ${EGLIBCPATCHES} \
diff --git a/meta/recipes-core/glibc/glibc_2.22.bb b/meta/recipes-core/glibc/glibc_2.22.bb
index f0e1fad..09df3f6 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"
 
 SRCREV ?= "a34d1c6afc86521d6ad17662a3b5362d8481514c"
 
-BRANCH ?= "release/${PV}/master"
+SRCBRANCH ?= "release/${PV}/master"
 
 GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
 
-SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
+SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \
            file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
            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 8950360..546f7f2 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/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0"
 
-BRANCH ?= "master"
+SRCBRANCH ?= "master"
 SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189"
 
 PV = "0.1"
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${BRANCH} \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \
            file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch"
 
 S = "${WORKDIR}/git"
-- 
2.5.2



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
  2015-09-17 13:21 [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness Otavio Salvador
@ 2015-09-17 13:30 ` Gary Thomas
  2015-09-17 13:33   ` Otavio Salvador
  2015-09-17 13:54 ` Khem Raj
  1 sibling, 1 reply; 6+ messages in thread
From: Gary Thomas @ 2015-09-17 13:30 UTC (permalink / raw)
  To: openembedded-core

On 2015-09-17 07:21, Otavio Salvador wrote:
> 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.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

These should be separated into one for glibc and another for mmc.
Also, the subject line needs to mention the recipe name based on
the commit guidelines.

> ---
>
> Changes in v2:
> - Use SRCBRANCH instead of SRC_BRANCH (Khem)
>
>   meta/recipes-core/glibc/cross-localedef-native_2.22.bb | 4 ++--
>   meta/recipes-core/glibc/glibc_2.22.bb                  | 4 ++--
>   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 2153ece..03be9c0 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
>
>   FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
>
> -BRANCH ?= "release/${PV}/master"
> +SRCBRANCH ?= "release/${PV}/master"
>   GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
>
> -SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
> +SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
>              git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
>              file://fix_for_centos_5.8.patch \
>              ${EGLIBCPATCHES} \
> diff --git a/meta/recipes-core/glibc/glibc_2.22.bb b/meta/recipes-core/glibc/glibc_2.22.bb
> index f0e1fad..09df3f6 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"
>
>   SRCREV ?= "a34d1c6afc86521d6ad17662a3b5362d8481514c"
>
> -BRANCH ?= "release/${PV}/master"
> +SRCBRANCH ?= "release/${PV}/master"
>
>   GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
>
> -SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
> +SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
>              file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \
>              file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
>              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 8950360..546f7f2 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/"
>   LICENSE = "GPLv2"
>   LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0"
>
> -BRANCH ?= "master"
> +SRCBRANCH ?= "master"
>   SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189"
>
>   PV = "0.1"
>
> -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${BRANCH} \
> +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \
>              file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch"
>
>   S = "${WORKDIR}/git"
>

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
  2015-09-17 13:30 ` Gary Thomas
@ 2015-09-17 13:33   ` Otavio Salvador
  2015-09-17 14:06     ` Richard Purdie
  0 siblings, 1 reply; 6+ messages in thread
From: Otavio Salvador @ 2015-09-17 13:33 UTC (permalink / raw)
  To: Gary Thomas; +Cc: Patches and discussions about the oe-core layer

On Thu, Sep 17, 2015 at 10:30 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> On 2015-09-17 07:21, Otavio Salvador wrote:
>>
>> 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.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
>
> These should be separated into one for glibc and another for mmc.
> Also, the subject line needs to mention the recipe name based on
> the commit guidelines.

I can split it but it does not make much sense for this specific case,
IMO. This is a global change and so it provides an easier view of
affected recipes for such a change. If it, supposedly, introduces a
regression it is easier to revert it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
  2015-09-17 13:21 [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness Otavio Salvador
  2015-09-17 13:30 ` Gary Thomas
@ 2015-09-17 13:54 ` Khem Raj
  2015-09-17 13:57   ` Otavio Salvador
  1 sibling, 1 reply; 6+ messages in thread
From: Khem Raj @ 2015-09-17 13:54 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: OpenEmbedded Core Mailing List

[-- Attachment #1: Type: text/plain, Size: 3629 bytes --]

On Thursday, September 17, 2015, Otavio Salvador <otavio@ossystems.com.br>
wrote:

> 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.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br <javascript:;>>
> ---
>
> Changes in v2:
> - Use SRCBRANCH instead of SRC_BRANCH (Khem)
>
>  meta/recipes-core/glibc/cross-localedef-native_2.22.bb | 4 ++--
>  meta/recipes-core/glibc/glibc_2.22.bb                  | 4 ++--
>  meta/recipes-devtools/mmc/mmc-utils_git.bb             | 4 ++--


Did you cover all the recipes



>  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 2153ece..03be9c0 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
>
>  FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
>
> -BRANCH ?= "release/${PV}/master"
> +SRCBRANCH ?= "release/${PV}/master"
>  GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
>
> -SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
> +SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
>             git://
> github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef
> \
>             file://fix_for_centos_5.8.patch \
>             ${EGLIBCPATCHES} \
> diff --git a/meta/recipes-core/glibc/glibc_2.22.bb
> b/meta/recipes-core/glibc/glibc_2.22.bb
> index f0e1fad..09df3f6 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"
>
>  SRCREV ?= "a34d1c6afc86521d6ad17662a3b5362d8481514c"
>
> -BRANCH ?= "release/${PV}/master"
> +SRCBRANCH ?= "release/${PV}/master"
>
>  GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
>
> -SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
> +SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
>
> file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \
>
> file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
>
> 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 8950360..546f7f2 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/"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM =
> "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0"
>
> -BRANCH ?= "master"
> +SRCBRANCH ?= "master"
>  SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189"
>
>  PV = "0.1"
>
> -SRC_URI = "git://
> git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${BRANCH}
> \
> +SRC_URI = "git://
> git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}
> \
>             file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch"
>
>  S = "${WORKDIR}/git"
> --
> 2.5.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org <javascript:;>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 6131 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
  2015-09-17 13:54 ` Khem Raj
@ 2015-09-17 13:57   ` Otavio Salvador
  0 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2015-09-17 13:57 UTC (permalink / raw)
  To: Khem Raj; +Cc: Otavio Salvador, OpenEmbedded Core Mailing List

On Thu, Sep 17, 2015 at 10:54 AM, Khem Raj <raj.khem@gmail.com> wrote:
>>  meta/recipes-core/glibc/cross-localedef-native_2.22.bb | 4 ++--
>>  meta/recipes-core/glibc/glibc_2.22.bb                  | 4 ++--
>>  meta/recipes-devtools/mmc/mmc-utils_git.bb             | 4 ++--
>
>
> Did you cover all the recipes

Yes.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness
  2015-09-17 13:33   ` Otavio Salvador
@ 2015-09-17 14:06     ` Richard Purdie
  0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2015-09-17 14:06 UTC (permalink / raw)
  To: Otavio Salvador
  Cc: Gary Thomas, Patches and discussions about the oe-core layer

On Thu, 2015-09-17 at 10:33 -0300, Otavio Salvador wrote:
> On Thu, Sep 17, 2015 at 10:30 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> > On 2015-09-17 07:21, Otavio Salvador wrote:
> >>
> >> 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.
> >>
> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >
> >
> > These should be separated into one for glibc and another for mmc.
> > Also, the subject line needs to mention the recipe name based on
> > the commit guidelines.
> 
> I can split it but it does not make much sense for this specific case,
> IMO. This is a global change and so it provides an easier view of
> affected recipes for such a change. If it, supposedly, introduces a
> regression it is easier to revert it.

I don't think it needs to be split, I would like "glibc/mmc-utils:" at
the start of the subject line so we give the casual reader some idea
what the scope of the patch is though. In this case I'll just add that
before merging.

Cheers,

Richard



^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-17 14:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-17 13:21 [PATCH v2] Rename 'BRANCH' variable to 'SRCBRANCH' for clearness Otavio Salvador
2015-09-17 13:30 ` Gary Thomas
2015-09-17 13:33   ` Otavio Salvador
2015-09-17 14:06     ` Richard Purdie
2015-09-17 13:54 ` Khem Raj
2015-09-17 13:57   ` Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.