[PATCH 00/11] Add read PV into recipes

[PATCH 00/11] Add read PV into recipes

[Emilia Ciobanu]

Tested for backwards packages.

The following changes since commit 3dee534f1e25109e0bdb681de0746c336f4b8840:

  lib/oeqa: fix dependecy check (2013-07-16 10:04:17 +0100)

are available in the git repository at:

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

Emilia Ciobanu (11):
  rt-tests: add PV variable into recipe
  kmod: add PV variable into recipe
  hwlatdetect: add PV variable into recipe
  lttng-ust: add PV variable into recipe
  connman-gnome: add PV variable into recipe
  mtd-utils: add PV variable into recipe
  update-rc.d: add PV variable into recipe
  build-appliance-image: add PV variable into recipe
  lttng-modules: Append _git to recipe name and update PV with git
    token
  chkconfig-alternatives-native: add git token in package version
  docbook-sgml-dtd-4.5-native.bb: Add real PV inside the recipe

 .../connman/connman-gnome_0.7.bb                   |    2 ++
 .../images/build-appliance-image_8.0.bb            |    2 ++
 meta/recipes-core/update-rc.d/update-rc.d_0.7.bb   |    1 +
 .../docbook-sgml-dtd-4.5-native.bb                 |    1 +
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |    0
 ...t-cleanmarker-with-flash_erase--j-command.patch |    0
 meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb       |    2 +-
 .../chkconfig-alternatives-native_1.3.59.bb        |    2 +-
 meta/recipes-kernel/kmod/kmod_git.bb               |    1 +
 ...lttng-modules_2.2.0.bb => lttng-modules_git.bb} |    2 +-
 meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb       |    2 +-
 meta/recipes-rt/rt-tests/hwlatdetect_0.85.bb       |    1 +
 meta/recipes-rt/rt-tests/rt-tests_0.85.bb          |    1 +
 13 files changed, 13 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/mtd/{mtd-utils-1.5.0 => mtd-utils}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
 rename meta/recipes-devtools/mtd/{mtd-utils-1.5.0 => mtd-utils}/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch (100%)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.2.0.bb => lttng-modules_git.bb} (97%)

-- 
1.7.9.5

[PATCH 01/11] rt-tests: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 meta/recipes-rt/rt-tests/rt-tests_0.85.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.85.bb b/meta/recipes-rt/rt-tests/rt-tests_0.85.bb
index c3964d2..522fb9c 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.85.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.85.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 require rt-tests.inc
 
 PR = "${INC_PR}.0"
+PV = "0.85+git${SRCPV}"
 
 # Do not install hwlatdetect
 EXTRA_OEMAKE += "PYLIB=''"
-- 
1.7.9.5

Re: [PATCH 01/11] rt-tests: add PV variable into recipe

[Otavio Salvador]

On Thu, Jul 18, 2013 at 11:16 AM, Emilia Ciobanu
<emilia.maria.silvia.ciobanu@intel.com> wrote:
> Git packages should include git token inside the PV variable.
>
> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>

I agree with the fix but it'd be better if you made it  clear you're
including Git revision into PV; the PV variable addition is just a
consequence, not the goal.

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

[PATCH 02/11] kmod: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 meta/recipes-kernel/kmod/kmod_git.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index ca6b004..6afaca6 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -4,6 +4,7 @@
 require kmod.inc
 
 PR = "${INC_PR}.0"
+PV = "9+git${SRCPV}"
 
 PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
 RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
-- 
1.7.9.5

[PATCH 03/11] hwlatdetect: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 meta/recipes-rt/rt-tests/hwlatdetect_0.85.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.85.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.85.bb
index 634b609..c4fba8e 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.85.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.85.bb
@@ -10,6 +10,7 @@ RRECOMMENDS_${PN} = "kernel-module-hwlat-detector"
 require rt-tests.inc
 
 PR = "${INC_PR}.0"
+PV = "0.85+git${SRCPV}"
 
 EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
 
-- 
1.7.9.5

[PATCH 04/11] lttng-ust: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
index d03f207..3028200 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
@@ -18,7 +18,7 @@ RREPLACES_${PN} = "lttng2-ust"
 RCONFLICTS_${PN} = "lttng2-ust"
 
 SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba"
-PV = "2.2.0"
+PV = "2.2.0+git${SRCPV}"
 PE = "2"
 
 SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
-- 
1.7.9.5

[PATCH 05/11] connman-gnome: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../connman/connman-gnome_0.7.bb                   |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index 6299e70..a755b3c 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
@@ -10,6 +10,8 @@ DEPENDS = "gtk+ dbus-glib intltool-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
+PV = "0.7+git${SRCPV}"
+
 SRC_URI = "git://github.com/connectivity/connman-gnome.git;protocol=git \
 	   file://0001-Removed-icon-from-connman-gnome-about-applet.patch \
 	   file://images/* \
-- 
1.7.9.5

[PATCH 06/11] mtd-utils: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.
Remove version from inner patch folder name.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |    0
 ...t-cleanmarker-with-flash_erase--j-command.patch |    0
 meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb       |    2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/mtd/{mtd-utils-1.5.0 => mtd-utils}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
 rename meta/recipes-devtools/mtd/{mtd-utils-1.5.0 => mtd-utils}/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch (100%)

diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.5.0/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
similarity index 100%
rename from meta/recipes-devtools/mtd/mtd-utils-1.5.0/add-exclusion-to-mkfs-jffs2-git-2.patch
rename to meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.5.0/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
similarity index 100%
rename from meta/recipes-devtools/mtd/mtd-utils-1.5.0/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
rename to meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb b/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb
index 5797204..5e65a69 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git \
         file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch "
 
 S = "${WORKDIR}/git/"
-
+PV = "1.5.0+git${SRCPV}"
 PR = "r3"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
-- 
1.7.9.5

[PATCH 07/11] update-rc.d: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 meta/recipes-core/update-rc.d/update-rc.d_0.7.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index bfcbd97..a103192 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/philb/update-rc.d.git;protocol=git \
            file://check-if-symlinks-are-valid.patch \
           "
 
+PV = "0.7+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit allarch
-- 
1.7.9.5

[PATCH 08/11] build-appliance-image: add PV variable into recipe

[Emilia Ciobanu]

Git packages should include git token inside the PV variable.

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../images/build-appliance-image_8.0.bb            |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/images/build-appliance-image_8.0.bb b/meta/recipes-core/images/build-appliance-image_8.0.bb
index fad4176..1b83911 100644
--- a/meta/recipes-core/images/build-appliance-image_8.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_8.0.bb
@@ -27,6 +27,8 @@ SRC_URI = "git://git.yoctoproject.org/poky;protocol=git \
            file://Yocto_Build_Appliance.vmxf \
           "
 
+PV = "8.0+git${SRCPV}"
+
 IMAGE_CMD_ext3_append () {
 	# We don't need to reserve much space for root, 0.5% is more than enough
 	tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
-- 
1.7.9.5

[PATCH 09/11] lttng-modules: Append _git to recipe name and update PV with git token

[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

[PATCH 10/11] 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

Re: [PATCH 10/11] chkconfig-alternatives-native: add git token in package version

[Chris Larson]

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

On Thu, Jul 18, 2013 at 7:16 AM, Emilia Ciobanu <
emilia.maria.silvia.ciobanu@intel.com> wrote:

> Git packages should have the following format:
>     version+gitAUTOINC[r|-]+revision
>
> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
>

Just as an FYI, in case you didn't consider it, this may well result in
package versions going backwards. Not in this case, but the general one,
depending on the SRCREV.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

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

Re: [PATCH 10/11] chkconfig-alternatives-native: add git token in package version

[Saul Wold]

On 07/18/2013 03:05 PM, Chris Larson wrote:
> On Thu, Jul 18, 2013 at 7:16 AM, Emilia Ciobanu
> <emilia.maria.silvia.ciobanu@intel.com
> <mailto:emilia.maria.silvia.ciobanu@intel.com>> wrote:
>
>     Git packages should have the following format:
>          version+gitAUTOINC[r|-]+revision
>
>     Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com
>     <mailto:emilia.maria.silvia.ciobanu@intel.com>>
>
>
> Just as an FYI, in case you didn't consider it, this may well result in
> package versions going backwards. Not in this case, but the general one,
> depending on the SRCREV.

I did ask her to verify that these would not, I believe that she did that.

Sau!

> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[PATCH 11/11] docbook-sgml-dtd-4.5-native.bb: Add real PV inside the recipe

[Emilia Ciobanu]

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../docbook-sgml-dtd-4.5-native.bb                 |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
index 6c464f4..ae723c7 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
+++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
 DTD_VERSION = "4.5"
 
 PR = "${INC_PR}.0"
+PV = "4.5"
 
 SRC_URI[md5sum] = "07c581f4bbcba6d3aac85360a19f95f7"
 SRC_URI[sha256sum] = "8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43"
-- 
1.7.9.5

Re: [PATCH 00/11] Add read PV into recipes

[Paul Eggleton]

Hi Emilia,

On Thursday 18 July 2013 17:16:24 Emilia Ciobanu wrote:
> Tested for backwards packages.
> 
> The following changes since commit 3dee534f1e25109e0bdb681de0746c336f4b8840:
> 
>   lib/oeqa: fix dependecy check (2013-07-16 10:04:17 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib emac/pv_fixes
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=emac/pv_fixes
> 
> Emilia Ciobanu (11):
>   rt-tests: add PV variable into recipe
>   kmod: add PV variable into recipe
>   hwlatdetect: add PV variable into recipe
>   lttng-ust: add PV variable into recipe
>   connman-gnome: add PV variable into recipe
>   mtd-utils: add PV variable into recipe
>   update-rc.d: add PV variable into recipe
>   build-appliance-image: add PV variable into recipe
>   lttng-modules: Append _git to recipe name and update PV with git
>     token
>   chkconfig-alternatives-native: add git token in package version
>   docbook-sgml-dtd-4.5-native.bb: Add real PV inside the recipe

Reviewing these for the consolidated pull I noticed that one or two change the 
filename to _git (or that's already the filename) whereas others don't. 

For recipes that do point to a git repository but are fetching the revision 
tagged for a release, it is correct to say they have a fixed PV without 
+git${SRCPV}, which is why we have done this. However, perhaps for consistency 
and avoidance of future confusion if SRCREV is changed we should ignore this.

When the recipe does set PV, it is probably best that the recipe's filename 
doesn't contain a specific version otherwise it could be that it gets upgraded 
later and the version in the filename no longer matches the new PV value. 
Therefore I'd suggest If PV is being set and the recipe is fetching from a git 
repository, we should rename the recipe to use _git.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre