[PATCH 0/4] Fix typos

[PATCH 0/4] Fix typos

[Emilia Ciobanu]

The following changes since commit dc86293f0444384e8ae5131fdd10b6cb077164b0:

  bitbake: HOB:Proper handle of SIGINT (2013-07-05 15:52:48 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib emac/typo_fixes
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=emac/typo_fixes

Emilia Ciobanu (4):
  chkconfig-alternatives-native: add git token in package version
  lttng-modules: rename recipe
  unzip: rename recipe
  zip: rename recipe

 .../chkconfig-alternatives-native_1.3.59.bb        |    2 +-
 .../unzip/{unzip_6.0.bb => unzip_60.bb}            |    0
 .../recipes-extended/zip/{zip_3.0.bb => zip_30.bb} |    0
 ...lttng-modules_2.2.0.bb => lttng-modules_git.bb} |    2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/unzip/{unzip_6.0.bb => unzip_60.bb} (100%)
 rename meta/recipes-extended/zip/{zip_3.0.bb => zip_30.bb} (100%)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.2.0.bb => lttng-modules_git.bb} (97%)

-- 
1.7.9.5

[PATCH 1/4] chkconfig-alternatives-native: add git token in package version

[Emilia Ciobanu]

Git packages should have the following format:
    version+gitAUTOINC[r|-]+revision

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../chkconfig-alternatives-native_1.3.59.bb        |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
index 7fd34aa..0b1077f 100644
--- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot"
 S = "${WORKDIR}/git"
 
 SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee"
-PV = "1.3.59+${SRCPV}"
+PV = "1.3.59+git${SRCPV}"
 
 inherit native
 
-- 
1.7.9.5

[PATCH 2/4] lttng-modules: rename recipe

[Emilia Ciobanu]

Git packages should have _git in their recipe name and should include
git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 ...lttng-modules_2.2.0.bb => lttng-modules_git.bb} |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.2.0.bb => lttng-modules_git.bb} (97%)

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb
similarity index 97%
rename from meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_git.bb
index dd35396..3a92879 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "virtual/kernel"
 inherit module
 
 SRCREV = "1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c"
-PV = "2.2.0"
+PV = "2.2.0+git${SRCPV}"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
            file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
-- 
1.7.9.5

Re: [PATCH 2/4] lttng-modules: rename recipe

[Saul Wold]

On 07/09/2013 01:57 AM, Emilia Ciobanu wrote:
> Git packages should have _git in their recipe name and should include
> git token inside the PV variable.
>
This is not really renaming the recipe, it's adding git to PV, please 
fix the commit summary.

Thanks
	Sau!

> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
> ---
>   ...lttng-modules_2.2.0.bb => lttng-modules_git.bb} |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>   rename meta/recipes-kernel/lttng/{lttng-modules_2.2.0.bb => lttng-modules_git.bb} (97%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb
> similarity index 97%
> rename from meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
> rename to meta/recipes-kernel/lttng/lttng-modules_git.bb
> index dd35396..3a92879 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb
> @@ -11,7 +11,7 @@ DEPENDS = "virtual/kernel"
>   inherit module
>
>   SRCREV = "1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c"
> -PV = "2.2.0"
> +PV = "2.2.0+git${SRCPV}"
>
>   SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
>              file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
>

Re: [PATCH v2 2/4] lttng-modules: rename recipe and update PV with git token

[Saul Wold]

On 07/16/2013 08:52 AM, Emilia Ciobanu wrote:
> Git packages should have _git in their recipe name and should include
> git token inside the PV variable.
>
Your not renaming the recipe, your just changing it to be GIT based and 
updating the PV!

A rename would change the name from lttng-modules to something else.

Sau!

> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
> ---
>   ...lttng-modules_2.2.0.bb => lttng-modules_git.bb} |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>   rename meta/recipes-kernel/lttng/{lttng-modules_2.2.0.bb => lttng-modules_git.bb} (97%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb
> similarity index 97%
> rename from meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
> rename to meta/recipes-kernel/lttng/lttng-modules_git.bb
> index dd35396..3a92879 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb
> @@ -11,7 +11,7 @@ DEPENDS = "virtual/kernel"
>   inherit module
>
>   SRCREV = "1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c"
> -PV = "2.2.0"
> +PV = "2.2.0+git${SRCPV}"
>
>   SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
>              file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
>

[PATCH 3/4] unzip: rename recipe

[Emilia Ciobanu]

Current local version is 60.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../unzip/{unzip_6.0.bb => unzip_60.bb}            |    0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-extended/unzip/{unzip_6.0.bb => unzip_60.bb} (100%)

diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_60.bb
similarity index 100%
rename from meta/recipes-extended/unzip/unzip_6.0.bb
rename to meta/recipes-extended/unzip/unzip_60.bb
-- 
1.7.9.5

[PATCH 4/4] zip: rename recipe

[Emilia Ciobanu]

Current local version is 30.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../recipes-extended/zip/{zip_3.0.bb => zip_30.bb} |    0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-extended/zip/{zip_3.0.bb => zip_30.bb} (100%)

diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_30.bb
similarity index 100%
rename from meta/recipes-extended/zip/zip_3.0.bb
rename to meta/recipes-extended/zip/zip_30.bb
-- 
1.7.9.5

Re: [PATCH 4/4] zip: rename recipe

[Burton, Ross]

On 9 July 2013 09:57, Emilia Ciobanu
<emilia.maria.silvia.ciobanu@intel.com> wrote:
> Current local version is 30.

Explaining why this has to happen would be useful.  I presume the
situation is that the package report system is reporting updates
because upstream is at version "30" but we're at "3.0", when the
reality is that upstream is sticking to 8+3 filenames so drops the
dots in the version number.

I'm not sure making our packages have the wrong version just because
upstream tarballs versions are mangled is wise.  Can we extend the PRS
so that it can transform the PV before comparing it to upstream?

Ross

Re: [PATCH 4/4] zip: rename recipe

[Ciobanu, Emilia Maria Silvia]

Hi Ross,

I'm looking at an alternative solution.

Thanks,
Ema
________________________________________
From: Burton, Ross [ross.burton@intel.com]
Sent: Thursday, July 11, 2013 1:21 PM
To: Ciobanu, Emilia Maria Silvia
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 4/4] zip: rename recipe

On 9 July 2013 09:57, Emilia Ciobanu
<emilia.maria.silvia.ciobanu@intel.com> wrote:
> Current local version is 30.

Explaining why this has to happen would be useful.  I presume the
situation is that the package report system is reporting updates
because upstream is at version "30" but we're at "3.0", when the
reality is that upstream is sticking to 8+3 filenames so drops the
dots in the version number.

I'm not sure making our packages have the wrong version just because
upstream tarballs versions are mangled is wise.  Can we extend the PRS
so that it can transform the PV before comparing it to upstream?

Ross

Re: [PATCH 0/4] Fix typos

[Paul Eggleton]

Hi Emilia,

On Tuesday 09 July 2013 11:57:37 Emilia Ciobanu wrote:
> The following changes since commit dc86293f0444384e8ae5131fdd10b6cb077164b0:
> 
>   bitbake: HOB:Proper handle of SIGINT (2013-07-05 15:52:48 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib emac/typo_fixes
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=emac/typo_fixes
> 
> Emilia Ciobanu (4):
>   chkconfig-alternatives-native: add git token in package version
>   lttng-modules: rename recipe
>   unzip: rename recipe
>   zip: rename recipe
> 
>  .../chkconfig-alternatives-native_1.3.59.bb        |    2 +-
>  .../unzip/{unzip_6.0.bb => unzip_60.bb}            |    0
>  .../recipes-extended/zip/{zip_3.0.bb => zip_30.bb} |    0
>  ...lttng-modules_2.2.0.bb => lttng-modules_git.bb} |    2 +-
>  4 files changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-extended/unzip/{unzip_6.0.bb => unzip_60.bb} (100%)
>  rename meta/recipes-extended/zip/{zip_3.0.bb => zip_30.bb} (100%)
>  rename meta/recipes-kernel/lttng/{lttng-modules_2.2.0.bb =>
> lttng-modules_git.bb} (97%)

Unfortunately the unzip and zip version changes are not correct - the upstream 
versions are 6.0 and 3.0 respectively, and these are the versions we want to 
be going into the final packages. However, if it would help with the package 
reporting system, the recipes could be changed to convert PV of "6.0" into 
"60" in SRC_URI using some inline python.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 0/4] Fix typos

[Burton, Ross]

On 9 July 2013 10:43, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> However, if it would help with the package
> reporting system, the recipes could be changed to convert PV of "6.0" into
> "60" in SRC_URI using some inline python.

Oh, somehow I didn't see Paul's reply.

This is basically what happens already:

SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@d.getVar('PV',1).replace('.',
'')}.tgz"

Ross