Skip to contentSkip to conversation

Partial merge of SRCPV

RFC New Martin Jansa 2 participants 9 messages Apr 13, 2010 – Apr 16, 2010

lore
Share & tools
lore
#0 lore raw

Please consider applying this patch series.

Proposed and discussed in [1], the main reason for NACK (multiple builders uploading to shared feeds) was resolved with bitbake patch [2] and it's enabled by default in PATCH 1/6. It needs bitbake 1.10 or master, but Koen confirmed yesterday that he is using 1.10 already.

People not using multiple builders or any of changed recipes don't need to upgrade their bitbake, just keep your tmp/cache dir even for rebuilds from scratch (as you already should, if you have ever used AUTOREV).

I'll keep SRCPV changes for other recipes in shr/unstable branch so maintainers of other recipes can move to SRCPV easily too.

WARNING: don't use BB_LOCALCOUNT_OVERRIDE with AUTOREV, it will make revision counter in PV constant and chaning SRCREV is not enough to ensure increasing PV.

[1] : http://www.mail-archive.com/[email protected]/msg01325.html
[2] : http://git.openembedded.org/cgit.cgi/bitbake/commit/?h=1.10&id=2f32735463159e9e42e03819d6b505dba49c7f17

#1 lore raw

PATCH 1/6 bitbake.conf: enable BB_LOCALCOUNT_OVERRIDE by default, please disable if you're using AUTOREV

* For now disable autoincrement of revision counter in SRCPV, whoever wants it, should enable it in local.conf or distro config. (Set it empty BB_LOCALCOUNT_OVERRIDE = "")
* Revision counter is incremented only locally (bad for multiple builders filling shared feeds), LOCALCOUNT can be used to maintain counter globally in OE metadata (LOCALCOUNT value set in recipe).
* Make sure you disable it, if you want always upgradable paths for git recipes without bumping LOCALCOUNT with every SRCREV change or if you're using AUTOREV feature.

* LOCALCOUNT == value for revision counter in GIT recipes (NNNN in PV="1.0+gitrNNNN+a7401084a72285c8d3485bacf4eed593f303b1b7-r4.4")

---
 conf/bitbake.conf |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
conf/bitbake.conf +10 -0
index 25b8782..7533518 100644
@@ -579,6 +579,16 @@ SRCREV = "1"
 SRCPV = "${@bb.fetch.get_srcrev(d)}"
 AUTOREV = "${SRCPV}"
 
+# For now disable autoincrement of revision counter in SRCPV, whoever wants it, should enable it in local.conf or distro config
+# Revision counter is incremented only locally (bad for multiple builders filling shared feeds), LOCALCOUNT can be used to maintain
+# counter globally in OE metadata (LOCALCOUNT value set in recipe).
+# Make sure you disable it, if you want always upgradable paths for git recipes without bumping LOCALCOUNT with every SRCREV change
+# or if you're using AUTOREV feature.
+BB_LOCALCOUNT_OVERRIDE = "1"
+
+# Value for revision counter in GIT recipes (NNNN in PV="1.0+gitrNNNN+a7401084a72285c8d3485bacf4eed593f303b1b7-r4.4")
+LOCALCOUNT = "0"
+
 SRC_URI = "file://${FILE}"
 
 ##################################################################
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/6 SHR: disable BB_LOCALCOUNT_OVERRIDE as we're using autoincremented SRCPV and AUTOREV in git recipes

In reply to Martin Jansa
---
 conf/distro/shr.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
conf/distro/shr.conf +1 -0
index db15a4d..7edc6af 100644
@@ -15,6 +15,7 @@ TOOLCHAIN_BRAND ?= ""
 
 #LIBC = "glibc"
 
+BB_LOCALCOUNT_OVERRIDE = ""
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc
 
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 3/6 linux-openmoko: use SRCPV in git recipes

In reply to Martin Jansa

* without PE bump, because nobody complained that we were bumping SRCREV without PV changes and we were using SRCPV in our branch before

---
 recipes/linux/linux-openmoko-2.6.24_git.bb        |    2 +-
 recipes/linux/linux-openmoko-2.6.28_git.bb        |    2 +-
 recipes/linux/linux-openmoko-2.6.31_git.bb        |    2 +-
 recipes/linux/linux-openmoko-2.6.32_git.bb        |    2 +-
 recipes/linux/linux-openmoko-devel_git.bb         |    2 +-
 recipes/linux/linux-openmoko-shr-devel_git.bb     |    2 +-
 recipes/linux/linux-openmoko-shr-drm-devel_git.bb |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
recipes/linux/linux-openmoko-2.6.24_git.bb +1 -1
index d980e21..f7f7e32 100644
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 SRCREV = "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 OEV = "oe5"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "\
recipes/linux/linux-openmoko-2.6.28_git.bb +1 -1
index 403a29b..cc5ab90 100644
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 SRCREV = "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 OEV = "oe2"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "\
recipes/linux/linux-openmoko-2.6.31_git.bb +1 -1
index 8db2533..c11e41b 100644
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 SRCREV = "dd32737aa524e09c1d141a0e735dd58674552244"
 OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "\
recipes/linux/linux-openmoko-2.6.32_git.bb +1 -1
index 11384c0..1a29511 100644
@@ -7,7 +7,7 @@ KERNEL_RELEASE="2.6.32.11"
 
 SRCREV = "14be1091928fcce66812a85129768fb253b36420"
 OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 PR = "r7"
 
 SRC_URI = "\
recipes/linux/linux-openmoko-devel_git.bb +1 -1
index ba2e9c4..21d227d 100644
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 SRCREV = "a15608f241a40b41fed5bffe511355c2067c4e88"
 OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "\
recipes/linux/linux-openmoko-shr-devel_git.bb +1 -1
index 69a340b..ec85932 100644
@@ -8,7 +8,7 @@ KERNEL_VERSION = "2.6.29-rc3"
 
 SRCREV = "a15608f241a40b41fed5bffe511355c2067c4e88"
 OMV = "oe11"
-PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}"
 PR = "r8"
 
 SRC_URI = "\
recipes/linux/linux-openmoko-shr-drm-devel_git.bb +1 -1
index a0253c5..da7c93d 100644
@@ -9,7 +9,7 @@ KERNEL_VERSION = "2.6.29-rc3-drm"
 
 SRCREV = "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
 OMV = "oe15"
-PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "\
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 4/6 freesmartphone: use SRCPV in git recipes

In reply to Martin Jansa

* with PE bump
* FSO people usually use fso-autorev.inc already, so this change won't change PV scheme

---
 recipes/freesmartphone/dbus-hlid_git.bb            |    3 ++-
 recipes/freesmartphone/frameworkd_git.bb           |    3 ++-
 recipes/freesmartphone/fso-abyss_git.bb            |    5 +++--
 recipes/freesmartphone/fso-apm_git.bb              |    3 ++-
 recipes/freesmartphone/fso-boot_git.bb             |    3 ++-
 recipes/freesmartphone/fso-gpsd_git.bb             |    3 ++-
 recipes/freesmartphone/fso-gsm0710muxd_git.bb      |    3 ++-
 recipes/freesmartphone/fso-monitord_git.bb         |    3 ++-
 recipes/freesmartphone/fso-sounds.bb               |    3 ++-
 recipes/freesmartphone/fso-specs_git.bb            |    3 ++-
 recipes/freesmartphone/fsodatad_git.bb             |    3 ++-
 recipes/freesmartphone/fsodeviced_git.bb           |    4 ++--
 recipes/freesmartphone/fsogsmd_git.bb              |    3 ++-
 recipes/freesmartphone/fsomusicd_git.bb            |    3 ++-
 recipes/freesmartphone/fsonetworkd_git.bb          |    3 ++-
 recipes/freesmartphone/fsotdld_git.bb              |    3 ++-
 recipes/freesmartphone/fsousaged_git.bb            |    3 ++-
 recipes/freesmartphone/gsmd2_git.bb                |    3 ++-
 .../illume-theme-freesmartphone_git.bb             |    3 ++-
 recipes/freesmartphone/libframeworkd-glib_git.bb   |    3 ++-
 recipes/freesmartphone/libfso-glib_git.bb          |    3 ++-
 recipes/freesmartphone/libfsobasics_git.bb         |    3 ++-
 recipes/freesmartphone/libfsoframework_git.bb      |    3 ++-
 recipes/freesmartphone/libfsoresource_git.bb       |    3 ++-
 recipes/freesmartphone/libfsotransport_git.bb      |    3 ++-
 recipes/freesmartphone/libgsm0710_git.bb           |    3 ++-
 recipes/freesmartphone/libgsm0710mux_git.bb        |    3 ++-
 recipes/freesmartphone/libpersistence_git.bb       |    3 ++-
 recipes/freesmartphone/mdbus2_git.bb               |    3 ++-
 recipes/freesmartphone/mdbus_git.bb                |    3 ++-
 recipes/freesmartphone/mickeyterm_git.bb           |    3 ++-
 recipes/freesmartphone/msmcommd_git.bb             |    3 ++-
 recipes/freesmartphone/mterm2_git.bb               |    3 ++-
 recipes/freesmartphone/multicat_git.bb             |    3 ++-
 recipes/freesmartphone/opimd-utils_git.bb          |    3 ++-
 recipes/freesmartphone/pycd_git.bb                 |    3 ++-
 recipes/freesmartphone/zhone2_git.bb               |    3 ++-
 recipes/freesmartphone/zhone_git.bb                |    3 ++-
 recipes/libgdbus/libgdbus_git.bb                   |    4 ++--
 recipes/libgee/libgee_git.bb                       |    3 ++-
 recipes/libnl/libnl2_git.bb                        |    3 ++-
 .../mobile-broadband-provider-info_git.bb          |    3 ++-
 recipes/serial-utils/pty-forward-native.bb         |    3 ++-
 recipes/serial-utils/serial-forward_git.bb         |    3 ++-
 .../vala-dbus-binding-tool.inc                     |    1 +
 .../vala-dbus-binding-tool_git.bb                  |    2 +-
 recipes/vala-terminal/vala-terminal_git.bb         |    3 ++-
 47 files changed, 93 insertions(+), 49 deletions(-)
recipes/freesmartphone/dbus-hlid_git.bb +2 -1
index f9bd114..c37e180 100644
@@ -5,7 +5,8 @@ SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib"
 LICENSE = "GPL"
 SRCREV = "5df7f49fe8881804aaab544a569fd164c3e93afb"
-PV = "1.0.1+gitr${SRCREV}"
+PV = "1.0.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/dbus-hlid.git;protocol=git;branch=master"
recipes/freesmartphone/frameworkd_git.bb +2 -1
index 707f1d8..2b6b0bb 100644
@@ -5,8 +5,9 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 SRCREV = "f751f2724eea23d0ca050bdf2672f9011ae09517"
-PV = "0.9.5.9+gitr${SRCREV}"
+PV = "0.9.5.9+gitr${SRCPV}"
 PR = "r3"
+PE = "1"
 
 inherit distutils update-rc.d python-dir
 
recipes/freesmartphone/fso-abyss_git.bb +3 -2
index 0296bfd..c23bbf4 100644
@@ -5,8 +5,9 @@ SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib libgsm0710mux"
 LICENSE = "GPL"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.9.2+gitr${SRCREV}"
-PR = "r0"
+PV = "0.9.2+gitr${SRCPV}"
+PE = "1"
+PR = "r1"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \
recipes/freesmartphone/fso-apm_git.bb +2 -1
index 01d9adb..a42492f 100644
@@ -3,10 +3,11 @@ AUTHOR = "Michael 'Mickey' Lauer <[email protected]>"
 HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console"
 LICENSE = "GPLv2"
+PE = "1"
 DEPENDS = "vala-native"
 RCONFLICTS = "apm"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "2.0.0+gitr${SRCREV}"
+PV = "2.0.0+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
recipes/freesmartphone/fso-boot_git.bb +2 -1
index 2266bee..3241ce5 100644
@@ -1,6 +1,7 @@
 require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
+PE = "1"
 PR = "${INC_PR}.0"
-PV = "0.2.0+gitr${SRCREV}"
+PV = "0.2.0+gitr${SRCPV}"
 S = "${WORKDIR}/git/tools/${PN}"
recipes/freesmartphone/fso-gpsd_git.bb +2 -1
index c8b1542..6ada1f5 100644
@@ -3,7 +3,8 @@ LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "dbus-glib"
 SRCREV = "39e810899110a9bb302cf2064e1c0f73541fb4e6"
-PV = "0.8+gitr${SRCREV}"
+PV = "0.8+gitr${SRCPV}"
+PE = "1"
 PR = "r2"
 
 SRC_URI = "\
recipes/freesmartphone/fso-gsm0710muxd_git.bb +2 -1
index bfc01b4..aec38f0 100644
@@ -4,7 +4,8 @@ SECTION = "console/network"
 DEPENDS = "dbus dbus-glib"
 LICENSE = "GPL"
 SRCREV = "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9"
-PV = "0.9.3.1+gitr${SRCREV}"
+PV = "0.9.3.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
recipes/freesmartphone/fso-monitord_git.bb +2 -1
index 58adb83..0c931bd 100644
@@ -4,7 +4,8 @@ SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib"
 LICENSE = "GPL"
 SRCREV = "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master"
recipes/freesmartphone/fso-sounds.bb +2 -1
index 32ca0cc..1349e3e 100644
@@ -2,7 +2,8 @@ DESCRIPTION = "A set of notification sounds"
 LICENSE = "CC"
 SECTION = "multimedia"
 SRCREV = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
+PE = "1"
 PR = "r2"
 
 SRC_URI = "\
recipes/freesmartphone/fso-specs_git.bb +2 -1
index d2daa2d..b97566e 100644
@@ -5,7 +5,8 @@ LICENSE = "BSD"
 DEPENDS = "libxslt-native"
 SECTION = "devel/specifications"
 SRCREV = "e3fcb57675f7f48b6848f5b8114961f9418eb17b"
-PV = "0.5.0-gitr${SRCREV}"
+PV = "0.5.0+gitr${SRCPV}"
+PE = "1"
 PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/specs.git;protocol=git;branch=master"
recipes/freesmartphone/fsodatad_git.bb +2 -1
index 7858638..9892e12 100644
@@ -2,7 +2,8 @@ require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PR = "${INC_PR}.2"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCPV}"
+PE = "1"
 
 DEPENDS += "\
   libxml2 \
recipes/freesmartphone/fsodeviced_git.bb +2 -2
index b7e93cb..90eb91c 100644
@@ -7,8 +7,8 @@ RDEPENDS += "libcanberra-alsa"
 # RRECOMMENDS += "fso-alsa-data"
 RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.9.0+gitr${SRCREV}"
-PE = "1"
+PV = "0.9.0+gitr${SRCPV}"
+PE = "2"
 PR = "${INC_PR}.10"
 
 EXTRA_OECONF = "\
recipes/freesmartphone/fsogsmd_git.bb +2 -1
index abbe36c..d331f31 100644
@@ -2,7 +2,8 @@ require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PR = "${INC_PR}.0"
-PV = "0.5.0+gitr${SRCREV}"
+PV = "0.5.0+gitr${SRCPV}"
+PE = "1"
 
 DEPENDS += "libfsoresource libgsm0710mux ppp msmcommd"
 
recipes/freesmartphone/fsomusicd_git.bb +2 -1
index 4648c73..2d1de2b 100644
@@ -6,8 +6,9 @@ require cornucopia.inc
 
 DEPENDS += "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "${INC_PR}.3"
+PE = "1"
 
 RDEPENDS += "\
 #gst-plugins-base
recipes/freesmartphone/fsonetworkd_git.bb +2 -1
index 67cc22a..e64de8e 100644
@@ -1,5 +1,6 @@
 require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.1.0.0+gitr${SRCREV}"
+PV = "0.1.0.0+gitr${SRCPV}"
+PE = "1"
 PR = "${INC_PR}.2"
recipes/freesmartphone/fsotdld_git.bb +2 -1
index 3ae74ce..d6cf3b7 100644
@@ -2,6 +2,7 @@ require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PR = "${INC_PR}.2"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
+PE = "1"
 
 DEPENDS += "libfsotransport libfsoresource"
recipes/freesmartphone/fsousaged_git.bb +2 -1
index 3516e47..b6806a7 100644
@@ -1,5 +1,6 @@
 require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.9.1.2+gitr${SRCREV}"
+PV = "0.9.1.2+gitr${SRCPV}"
+PE = "1"
 PR = "${INC_PR}.0"
recipes/freesmartphone/gsmd2_git.bb +2 -1
index 96ed563..12ddac5 100644
@@ -5,7 +5,8 @@ SECTION = "console/network"
 DEPENDS = "dbus dbus-glib"
 LICENSE = "GPL"
 SRCREV = "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCPV}"
+PE = "1"
 PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master"
recipes/freesmartphone/illume-theme-freesmartphone_git.bb +2 -1
index 2babd91..f9c6599 100644
@@ -3,7 +3,8 @@ HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 DEPENDS = "edje-native eet-native"
 SRCREV = "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
recipes/freesmartphone/libframeworkd-glib_git.bb +2 -1
index 4c7b5a0..bfbe560 100644
@@ -3,7 +3,8 @@ LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "dbus-glib"
 SRCREV = "487b092dd3daa12a5beff0abe1be3f53d82f4bf0"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libframeworkd-glib.git;protocol=git;branch=master"
recipes/freesmartphone/libfso-glib_git.bb +2 -1
index 922ff54..18d4f80 100644
@@ -4,7 +4,8 @@ LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
 SRCREV = "f1a0b3fe2ed6e15d83ad4880b4eb7aece00f9d57"
-PV = "0.2.2+gitr${SRCREV}"
+PV = "0.2.2+gitr${SRCPV}"
+PE = "1"
 PR = "r3"
 
 inherit autotools_stage pkgconfig vala
recipes/freesmartphone/libfsobasics_git.bb +2 -1
index b34cc3e..3512c13 100644
@@ -3,5 +3,6 @@ require cornucopia.inc
 DESCRIPTION = "freesmartphone.org support library"
 DEPENDS += "libnl2"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.9.9+gitr${SRCREV}"
+PV = "0.9.9+gitr${SRCPV}"
+PE = "1"
 PR = "${INC_PR}.0"
recipes/freesmartphone/libfsoframework_git.bb +2 -1
index afc4291..c07f609 100644
@@ -2,6 +2,7 @@ require cornucopia.inc
 DESCRIPTION = "freesmartphone.org support library"
 DEPENDS += "libfsobasics alsa-lib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.8.0+gitr${SRCREV}"
+PV = "0.8.0+gitr${SRCPV}"
+PE = "1"
 PR = "${INC_PR}.0"
 
recipes/freesmartphone/libfsoresource_git.bb +2 -1
index 3e809f2..fe6c371 100644
@@ -2,5 +2,6 @@ require cornucopia.inc
 DESCRIPTION = "freesmartphone.org dbus resource library"
 DEPENDS += "libfso-glib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.1.1+gitr${SRCREV}"
+PV = "0.1.1+gitr${SRCPV}"
+PE = "1"
 PR = "${INC_PR}.0"
recipes/freesmartphone/libfsotransport_git.bb +2 -1
index 79bde22..7e7e6d6 100644
@@ -1,5 +1,6 @@
 require cornucopia.inc
 DESCRIPTION = "freesmartphone.org transport library"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.9.6+gitr${SRCREV}"
+PV = "0.9.6+gitr${SRCPV}"
+PE = "1"
 PR = "${INC_PR}.0"
recipes/freesmartphone/libgsm0710_git.bb +2 -1
index ab1f81d..6b78c9f 100644
@@ -2,7 +2,8 @@ DESCRIPTION = "A GSM 07.10 Protocol Engine"
 LICENSE = "GPL"
 SECTION = "devel"
 SRCREV = "52eea64bdbb79c09002b46e98a5e656509884f72"
-PV = "1.2.0+gitr${SRCREV}"
+PV = "1.2.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master"
recipes/freesmartphone/libgsm0710mux_git.bb +2 -1
index 0f7dad9..f85be3c 100644
@@ -4,7 +4,8 @@ LICENSE = "GPL"
 SECTION = "devel"
 DEPENDS = "glib-2.0 libgsm0710 libfsotransport"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.9.2+gitr${SRCREV}"
+PV = "0.9.2+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
recipes/freesmartphone/libpersistence_git.bb +2 -1
index f204d44..0550045 100644
@@ -4,7 +4,8 @@ LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "libgee"
 SRCREV = "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "\
recipes/freesmartphone/mdbus2_git.bb +2 -1
index eb00e83..76af519 100644
@@ -5,8 +5,9 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 dbus dbus-glib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "2.0.0+gitr${SRCREV}"
+PV = "2.0.0+gitr${SRCPV}"
 PR = "r0"
+PE = "1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/mdbus2"
recipes/freesmartphone/mdbus_git.bb +2 -1
index b5bf378..f90fd7e 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
-PV = "0.9.2+gitr${SRCREV}"
+PV = "0.9.2+gitr${SRCPV}"
+PE = "1"
 PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
recipes/freesmartphone/mickeyterm_git.bb +2 -1
index 9e89a55..2073021 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
-PV = "2.9.1+gitr${SRCREV}"
+PV = "2.9.1+gitr${SRCPV}"
+PE = "1"
 PR = "r3"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
recipes/freesmartphone/msmcommd_git.bb +2 -1
index 8af07b1..7177e50 100644
@@ -5,8 +5,9 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "libgee libfsotransport"
 SRCREV = "23c0cd870fc989792a20c6c662db4400129bd471"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCPV}"
 PR = "r2"
+PE = "1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
recipes/freesmartphone/mterm2_git.bb +2 -1
index 4b8a670..f459a4a 100644
@@ -5,7 +5,8 @@ SECTION = "console/network"
 DEPENDS = "dbus dbus-glib readline libfsoframework libfsotransport"
 LICENSE = "GPL"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "\
recipes/freesmartphone/multicat_git.bb +2 -1
index edbbb9a..a47f605 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console"
 LICENSE = "GPLv2"
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
recipes/freesmartphone/opimd-utils_git.bb +2 -1
index 08f3293..79a44ae 100644
@@ -5,8 +5,9 @@ LICENSE ?= "GPL"
 RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd"
 SECTION = "x11/application"
 SRCREV = "1872cdebe1209123710259e25cb8c8b47a627112"
-PV = "0.0.3+gitr${SRCREV}"
+PV = "0.0.3+gitr${SRCPV}"
 PR = "r0"
+PE = "1"
 
 inherit setuptools
 
recipes/freesmartphone/pycd_git.bb +2 -1
index 7f5f2be..92b0bb9 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
-PV = "0.1+gitr${SRCREV}"
+PV = "0.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
recipes/freesmartphone/zhone2_git.bb +2 -1
index 14d7097..11402b4 100644
@@ -5,8 +5,9 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 DEPENDS = "edje-native vala-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib"
 SRCREV = "1e3dca8a407f4e69636c47d9f22b31f8ae718d5a"
-PV = "2.0.0+gitr${SRCREV}"
+PV = "2.0.0+gitr${SRCPV}"
 PR = "r2"
+PE = "1"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/aurora.git;protocol=git;branch=master \
recipes/freesmartphone/zhone_git.bb +2 -1
index 964b58a..c1559f4 100644
@@ -3,7 +3,8 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
 SRCREV = "bd1e895f73a0e5beb2608ebe111d7ef32ee3adbc"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
+PE = "1"
 PR = "r13"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
recipes/libgdbus/libgdbus_git.bb +2 -2
index 0cacab8..73c95f3 100644
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 LICENSE = "GPL LGPL"
 DEPENDS = "glib-2.0 dbus"
 SRCREV = "aeab6e3c0185b271ca343b439470491b99cc587f"
-PE = "1"
-PV = "0.2+gitr${SRCREV}"
+PE = "2"
+PV = "0.2+gitr${SRCPV}"
 
 SRC_URI  = "git://git.moblin.org/repos/projects/libgdbus.git;protocol=http"
 S = "${WORKDIR}/git"
recipes/libgee/libgee_git.bb +2 -1
index 26b1fe5..c6324c7 100644
@@ -5,7 +5,8 @@ SECTION = "libs"
 DEPENDS = "glib-2.0"
 LICENSE = "LGPL"
 SRCREV = "a86abd4240622ec377bbc5773850a4593e13f7eb"
-PV = "0.5.0+gitr${SRCREV}"
+PV = "0.5.0+gitr${SRCPV}"
+PE = "1"
 
 SRC_URI = "\
   git://git.gnome.org/libgee;protocol=git;branch=master \
recipes/libnl/libnl2_git.bb +2 -1
index 9deaad2..3e17517 100644
@@ -3,7 +3,8 @@ SECTION = "libs/network"
 LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl"
 SRCREV = "8808743839b0f459394ecd00cb0f7c1896c0ab7a"
-PV = "1.9+gitr${SRCREV}"
+PV = "1.9+gitr${SRCPV}"
+PE = "1"
 PR = "r1"
 
 inherit autotools
recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +2 -1
index 0fa6115..eb7d19c 100644
@@ -2,7 +2,8 @@ DESCRIPTION = "Mobile Broadband Service Provider Database"
 SECTION = "network"
 LICENSE = "CCPD"
 SRCREV = "bc536218490377ccbd09c4e5858d37c91c2f03f7"
-PV = "gitr${SRCREV}"
+PV = "1.0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info;protocol=git"
recipes/serial-utils/pty-forward-native.bb +2 -1
index f14c057..6ea4f2f 100644
@@ -3,7 +3,8 @@ AUTHOR = "Holger 'Zecke' Freyther"
 LICENSE = "GPL"
 SECTION = "console/network"
 SRCREV = "4662b55fdba528bb5b3349f83055bf236af5d63b"
-PV = "1.1+gitr${SRCREV}"
+PV = "1.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git"
recipes/serial-utils/serial-forward_git.bb +2 -1
index 54154ab..2ba9486 100644
@@ -3,7 +3,8 @@ AUTHOR = "Holger 'Zecke' Freyther'"
 LICENSE = "GPL"
 SECTION = "console/devel"
 SRCREV = "50cf4ff2198589a8db369789fc038604a892a54d"
-PV = "1.1+gitr${SRCREV}"
+PV = "1.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git/;protocol=git"
recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc +1 -0
index b28079c..93e60b5 100644
@@ -3,6 +3,7 @@ SECTION = "devel"
 DEPENDS = "vala libgee libxml2 intltool-native"
 HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool"
 LICENSE = "GPLv2"
+PE = "1"
 INC_PR = "r3"
 
 SRC_URI = "http://downloads.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive"
recipes/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb +1 -1
index e4e7a2c..5eb7a45 100644
@@ -1,6 +1,6 @@
 require vala-dbus-binding-tool.inc
 SRCREV = "8e6868c6a2fe055daf8b1cf3d68134fb83909186"
-PV = "0.1.6+gitr${SRCREV}"
+PV = "0.1.6+gitr${SRCPV}"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
recipes/vala-terminal/vala-terminal_git.bb +2 -1
index ff79481..a782bf7 100644
@@ -2,7 +2,8 @@ DESCRIPTION = "A lightweight Terminal Emulator based on libvte, written in Vala.
 SECTION = "x11/applications"
 DEPENDS = "vala-native vte"
 SRCREV = "fda5f26710acfc0befe04c8f2e58b35bdba297f7"
-PV = "1.1.1+gitr${SRCREV}"
+PV = "1.1.1+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 inherit autotools
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 5/6 shr recipes: use SRCPV in git recipes

In reply to Martin Jansa

* recipes probably used only in SHR distribution
* usually without PE bump, because nobody complained that we were bumping SRCREV without PV changes and we were using SRCPV in our branch before

---
 recipes/gpe-icons/gpe-theme-neo_git.bb             |    2 +-
 recipes/obsolete/shr/alsa-scenarii-shr_git.bb      |    2 +-
 recipes/obsolete/shr/etk-theme-neo_git.bb          |    2 +-
 recipes/obsolete/shr/etk-theme-shr_git.bb          |    2 +-
 .../libframeworkd-phonegui-efl-theme-neo_git.bb    |    2 +-
 .../shr/libframeworkd-phonegui-efl2_git.bb         |    2 +-
 .../obsolete/shr/libframeworkd-phonegui-efl_git.bb |    2 +-
 recipes/obsolete/shr/libframeworkd-phonegui_git.bb |    2 +-
 recipes/obsolete/shr/shr-contacts_git.bb           |    2 +-
 recipes/obsolete/shr/shr-dialer_git.bb             |    2 +-
 recipes/obsolete/shr/shr-messages_git.bb           |    2 +-
 recipes/pyphonelog/pyphonelog_git.bb               |    2 +-
 recipes/python/python-phoneutils_git.bb            |    2 +-
 recipes/shr/e-wm-config-illume-shr_git.bb          |    2 +-
 recipes/shr/e-wm-config-illume2-shr_git.bb         |    2 +-
 recipes/shr/e-wm-menu-shr_git.bb                   |    2 +-
 recipes/shr/e-wm-sysactions-shr_git.bb             |    2 +-
 recipes/shr/e-wm-theme-illume-gry_git.bb           |    2 +-
 recipes/shr/e-wm-theme-illume-neo_git.bb           |    2 +-
 recipes/shr/e-wm-theme-illume-niebiee_git.bb       |    2 +-
 recipes/shr/e-wm-theme-illume-shr_git.bb           |    2 +-
 recipes/shr/e-wm-theme-illume-sixteen_git.bb       |    2 +-
 recipes/shr/elementary-theme-gry_git.bb            |    2 +-
 recipes/shr/elementary-theme-neo_git.bb            |    2 +-
 recipes/shr/elementary-theme-niebiee_git.bb        |    2 +-
 recipes/shr/elementary-theme-o2_git.bb             |    2 +-
 recipes/shr/elementary-theme-sixteen_git.bb        |    2 +-
 recipes/shr/frameworkd-config-shr_git.bb           |    2 +-
 recipes/shr/gtk-theme-neo_git.bb                   |    2 +-
 recipes/shr/icon-theme-neo_git.bb                  |    2 +-
 recipes/shr/libmodulo_git.bb                       |    2 +-
 recipes/shr/libphone-ui-shr_git.bb                 |    2 +-
 recipes/shr/libphone-ui_git.bb                     |    2 +-
 recipes/shr/libphone-utils_git.bb                  |    2 +-
 recipes/shr/ologicd_git.bb                         |    2 +-
 recipes/shr/phonefsod_git.bb                       |    2 +-
 recipes/shr/phoneui-apps_git.bb                    |    2 +-
 recipes/shr/phoneui-shr-theme-neo_git.bb           |    2 +-
 recipes/shr/phoneui-shr-theme-o2_git.bb            |    2 +-
 recipes/shr/phoneuid_git.bb                        |    2 +-
 recipes/shr/shr-config_git.bb                      |    2 +-
 recipes/shr/shr-e-gadgets_git.bb                   |    2 +-
 recipes/shr/shr-installer_git.bb                   |    2 +-
 recipes/shr/shr-settings_git.bb                    |    2 +-
 recipes/shr/shr-specs_git.bb                       |    2 +-
 recipes/shr/shr-splash-theme-dontpanic_git.bb      |    2 +-
 recipes/shr/shr-splash-theme-handy_git.bb          |    2 +-
 recipes/shr/shr-splash-theme-logo_git.bb           |    2 +-
 recipes/shr/shr-splash-theme-niebiee_git.bb        |    2 +-
 recipes/shr/shr-splash-theme-simple_git.bb         |    2 +-
 recipes/shr/shr-splash-theme-tux_git.bb            |    2 +-
 recipes/shr/shr-splash_git.bb                      |    2 +-
 recipes/shr/shr-theme-gtk-e17lookalike_git.bb      |    2 +-
 recipes/shr/shr-theme_git.bb                       |    2 +-
 recipes/shr/shr-today_git.bb                       |    2 +-
 recipes/shr/shr-wizard_git.bb                      |    2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)
recipes/gpe-icons/gpe-theme-neo_git.bb +1 -1
index f0f4e0f..1de7fba 100644
@@ -5,7 +5,7 @@ RSUGGESTS = "gpe-filemanager gpe-sketchbook elementary-theme-neo e-wm-theme-illu
 LICENSE = "unknown"
 
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "${INC_PR}.2"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/obsolete/shr/alsa-scenarii-shr_git.bb +1 -1
index cb21e2a..35bf569 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
 SRCREV = "8e89c8dbae569a08cac246a3805fca20988c0ad1"
-PV = "1.0+gitr${SRCREV}"
+PV = "1.0+gitr${SRCPV}"
 PR = "r4"
 
 COMPATIBLE_MACHINE = "(om-gta01|om-gta02|htcdream)"
recipes/obsolete/shr/etk-theme-neo_git.bb +1 -1
index ab028b1..42fcf70 100644
@@ -5,7 +5,7 @@ RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-
 LICENSE = "unknown"
 
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r4"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/obsolete/shr/etk-theme-shr_git.bb +1 -1
index 764955e..610b3e1 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "etk SHR theme"
 LICENSE = "MIT BSD"
-PV = "1.1.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "1.1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r2"
 
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
recipes/obsolete/shr/libframeworkd-phonegui-efl-theme-neo_git.bb +1 -1
index 15dcc2f..b94914e 100644
@@ -6,7 +6,7 @@ RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-
 LICENSE = "unknown"
 
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r3"
 
 require libframeworkd-phonegui-efl-theme.inc
recipes/obsolete/shr/libframeworkd-phonegui-efl2_git.bb +1 -1
index 9d4d74e..302c58f 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "frameworkd EFL phonegui 2"
 SECTION = "e/apps"
 DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r2"
 
 SRCREV = "917226025c67b75def91e98ea923c2e550474a5b"
recipes/obsolete/shr/libframeworkd-phonegui-efl_git.bb +1 -1
index 34f9692..c75eaab 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "e/apps"
 DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
-PV = "0.0.3+gitr${SRCREV}"
+PV = "0.0.3+gitr${SRCPV}"
 PR = "r36"
 
 require libframeworkd-phonegui-efl-theme.inc
recipes/obsolete/shr/libframeworkd-phonegui_git.bb +1 -1
index b11f039..29d22a9 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Frameworkd phonegui library"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r10"
 
 DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils"
recipes/obsolete/shr/shr-contacts_git.bb +1 -1
index 6a22831..ae18feb 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r6"
 
 inherit pkgconfig autotools
recipes/obsolete/shr/shr-dialer_git.bb +1 -1
index 816f9d8..f1e9cd3 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r9"
 
 inherit pkgconfig autotools
recipes/obsolete/shr/shr-messages_git.bb +1 -1
index cb8fc81..35db6c6 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r8"
 
 inherit pkgconfig autotools
recipes/pyphonelog/pyphonelog_git.bb +1 -1
index 16ed035..68c72e3 100644
@@ -9,7 +9,7 @@ inherit distutils
 
 S = "${WORKDIR}/git"
 SRCREV = "7672065334cb64e890cfb86d0236f4c36d595e4b"
-PV = "0.17.0+gitr${SRCREV}"
+PV = "0.17.0+gitr${SRCPV}"
 PR = "r0"
 SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http"
 FILES_${PN} += "${datadir}/applications/phonelog.desktop \
recipes/python/python-phoneutils_git.bb +1 -1
index 2c6fca1..1cf705a 100644
@@ -4,7 +4,7 @@ DEPENDS = "libphone-utils python-cython-native python-pyrex-native"
 RDEPENDS = "libphone-utils"
 
 SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master"
recipes/shr/e-wm-config-illume-shr_git.bb +1 -1
index 2f38545..522f7cb 100644
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "eet"
 LICENSE = "MIT BSD"
 SRCREV = "285e2f0a92fc47d9a739c5a1a936124b6e6fa819"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 
 inherit e
 
recipes/shr/e-wm-config-illume2-shr_git.bb +1 -1
index bc9a3f7..7f978eb 100644
@@ -4,7 +4,7 @@ DEPENDS = "eet"
 LICENSE = "MIT BSD"
 RDEPENDS = "shr-e-gadgets"
 SRCREV = "1b6bd24e828455f56c26b2f5cbbf2d16838cace8"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 
 inherit e
 
recipes/shr/e-wm-menu-shr_git.bb +1 -1
index 2924557..d6232ac 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR applications.menu config"
 SECTION = "e/utils"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r1"
 
 RCONFLICTS_${PN} = "e-wm-menu"
recipes/shr/e-wm-sysactions-shr_git.bb +1 -1
index 38d01a5..075d02b 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR sysactions config"
 SECTION = "e/utils"
 LICENSE = "MIT BSD"
 SRCREV = "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
-PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r4"
 
 RPROVIDES_${PN} = "e-wm-sysactions"
recipes/shr/e-wm-theme-illume-gry_git.bb +1 -1
index 16f3482..3d5a5fd 100644
@@ -7,7 +7,7 @@ RRECOMMENDS = "elementary-theme-gry"
 LICENCE = "unknown"
 
 SRCREV = "a0a974b1e1150aefdf29e8f0ac471a2a60e62532"
-PV = "0.3-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/e-wm-theme-illume-neo_git.bb +1 -1
index ca1b3ab..43705c8 100644
@@ -8,7 +8,7 @@ RSUGGESTS = "elementary-theme-neo gtk-theme-neo gpe-theme-neo icon-theme-neo"
 LICENCE = "unknown"
 
 SRCREV = "820f4d41531ad6f790615b6a7312a60e30e99fdc"
-PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/e-wm-theme-illume-niebiee_git.bb +1 -1
index d91aa89..3695c01 100644
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/e-wm-theme-illume-shr_git.bb +1 -1
index 491626c..b6354d5 100644
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/e-wm-theme-illume-sixteen_git.bb +1 -1
index bdce640..5c06d5c 100644
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/elementary-theme-gry_git.bb +1 -1
index 5721a76..8b4ed4d 100644
@@ -7,7 +7,7 @@ RRECOMMENDS = "e-wm-theme-illume-gry"
 LICENSE = "unknown"
 
 SRCREV = "2b62d1c9b02da047071105a7b5695acd6c6dbcca"
-PV = "0.8-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
recipes/shr/elementary-theme-neo_git.bb +1 -1
index ff31044..a7080d4 100644
@@ -7,7 +7,7 @@ RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-
 LICENSE = "unknown"
 
 SRCREV = "fb377425e69ce1fc13f5094801b96836203e8154"
-PV = "0.5-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.5-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
recipes/shr/elementary-theme-niebiee_git.bb +1 -1
index 6e9bae3..f744893 100644
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
 SRCREV = "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
-PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/elementary-theme-o2_git.bb +1 -1
index 45e37e6..54a7f81 100644
@@ -7,7 +7,7 @@ RSUGGESTS = "phoneui-shr-theme-o2"
 LICENSE = "unknown"
 
 SRCREV = "b5eb3134850c277ad8ae1a960b03ff4a509278a8"
-PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
recipes/shr/elementary-theme-sixteen_git.bb +1 -1
index 5c89d2e..abb2fa7 100644
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
 SRCREV = "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
-PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/frameworkd-config-shr_git.bb +1 -1
index 181bde3..f25e60d 100644
@@ -9,7 +9,7 @@ SRCREV_pn-frameworkd-config-shr_FSO_REV ?= "f751f2724eea23d0ca050bdf2672f9011ae0
 SRCREV_pn-frameworkd-config-shr_SHR_REV ?= "cdf5b5f3d8f37d6d91e1eb8d9cf07d034291df87"
 
 SRCREV_FORMAT = "FSO_REV-SHR_REV"
-PV = "0.9.5.9+gitr${SRCREV}"
+PV = "0.9.5.9+gitr${SRCPV}"
 PR = "r8"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \
recipes/shr/gtk-theme-neo_git.bb +1 -1
index 94f9b9f..d979e24 100644
@@ -6,7 +6,7 @@ RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gpe-theme-neo icon-theme
 LICENSE = "unknown"
 
 SRCREV = "f847105c5ef5d488a4bce0c0a85d572c3509d56f"
-PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/icon-theme-neo_git.bb +1 -1
index b989472..ff2bfb9 100644
@@ -7,7 +7,7 @@ RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-
 LICENSE = "unknown"
 
 SRCREV = "f847105c5ef5d488a4bce0c0a85d572c3509d56f"
-PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/libmodulo_git.bb +1 -1
index 0386d40..49146da 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "Modulo is a lightweight component container that supports Inversion Of Control, also commonly called Dependency Injection"
 SECTION = "libs"
 SRCREV = "7d2f657d248bd86377e66c329aa6826459d406da"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r1"
 
 inherit autotools autotools_stage pkgconfig vala
recipes/shr/libphone-ui-shr_git.bb +1 -1
index 8854ceb..d764a48 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR default module for the Phone UI daemon"
 SECTION = "e/apps"
 DEPENDS += " dbus-glib libframeworkd-glib libphone-ui evas ecore edje edje-native elementary"
 SRCREV = "2106165a2be62053f9d0019d50813823a84b8421"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master"
recipes/shr/libphone-ui_git.bb +1 -1
index ccc6808..20f1e05 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
 SRCREV = "08ccc9710b1f33c93cc8f1c20be9c658ef5040dd"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r0"
 
 DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils alsa-lib"
recipes/shr/libphone-utils_git.bb +1 -1
index f842ccd..88d5d4b 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "phone-utils library"
 SECTION = "libs"
 SRCREV = "3eb7242866543a266bd43a048d05b1a674ce94cf"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r2"
 
 DEPENDS="glib-2.0"
recipes/shr/ologicd_git.bb +1 -1
index e38e405..aaf8620 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = ""
 SECTION = "libs"
 SRCREV = "4a32af91a9479ebd4d1d39057354ac9904d74cbb"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r0"
 
 inherit autotools
recipes/shr/phonefsod_git.bb +1 -1
index 8b9a4b0..66cfd12 100644
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs"
 SRCREV = "de3eab1df1682cb41abfd105bb6767fedfbbf7b4"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r4"
 
 SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master"
recipes/shr/phoneui-apps_git.bb +1 -1
index 7db24dc..bb7558f 100644
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib"
 SRCREV = "d349e764400d7a4eaaa12f359d6c64b3ca55faaf"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r1"
 
 inherit pkgconfig autotools
recipes/shr/phoneui-shr-theme-neo_git.bb +1 -1
index 7f67911..3efa82b 100644
@@ -7,7 +7,7 @@ DEPENDS = "edje-native"
 RDEPENDS = "libphone-ui-shr"
 RSUGGESTS = "e-wm-theme-illume-neo gtk-theme-neo icon-theme-neo elementary-theme-neo"
 SRCREV = "df522dfc585fc0ad83e7164f451d15fb770c524b"
-PV = "0.1+gitr${SRCREV}"
+PV = "0.1+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/phoneui-shr-theme-o2_git.bb +1 -1
index 369c4a1..a30a795 100644
@@ -7,7 +7,7 @@ DEPENDS = "edje-native"
 RDEPENDS = "libphone-ui-shr"
 RSUGGESTS = "elementary-theme-o2"
 SRCREV = "5093da3ca27bb50388ac3277d8685a38772d7f48"
-PV = "0.1+gitr${SRCREV}"
+PV = "0.1+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/phoneuid_git.bb +1 -1
index 1ecf077..e188f30 100644
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs"
 SRCREV = "30e063783b4b3fe5a411e7739d76dc85129452aa"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r6"
 
 RREPLACES_${PN} = "shr-today"
recipes/shr/shr-config_git.bb +1 -1
index fd78695..08434ff 100644
@@ -5,7 +5,7 @@ LICENSE  = "GPLv2"
 DEPENDS = "vala-native elementary libeflvala"
 SECTION = "x11/application"
 SRCREV = "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r5"
 
 EXTRA_OECONF="--enable-vapidir=${STAGING_DATADIR}/vala/vapi"
recipes/shr/shr-e-gadgets_git.bb +1 -1
index acef09b..f5b3675 100644
@@ -6,7 +6,7 @@ RDEPENDS = "e-wm"
 SECTION = "x11/application"
 
 SRCREV = "c23dda5f81ed3c6d785617696fb009adb5594a55"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 
 inherit autotools
 
recipes/shr/shr-installer_git.bb +1 -1
index 2b90847..8823cba 100644
@@ -6,7 +6,7 @@ RDEPENDS = "python-elementary python-dbus python-core python-edbus packagekit"
 SECTION = "x11/application"
 
 SRCREV = "8608816ea1a1ac14b6e9faaa3685dd2b6450e889"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r0"
 
 inherit setuptools
recipes/shr/shr-settings_git.bb +1 -1
index 507be0f..02cc18f 100644
@@ -6,7 +6,7 @@ RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrt
 SECTION = "x11/application"
 SRCREV = "b6aed65934cf047f1abd3d8f630d87f900422c38"
 PE = "1"
-PV = "0.1.1+gitr${SRCREV}"
+PV = "0.1.1+gitr${SRCPV}"
 PR = "r9"
 
 inherit setuptools
recipes/shr/shr-specs_git.bb +1 -1
index 9546552..d257b26 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "BSD"
 SECTION = "devel/specifications"
 SRCREV = "d8f0dc85f1a7a6c0c6d24755f3770a55229621ae"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-specs.git;protocol=http;branch=master"
recipes/shr/shr-splash-theme-dontpanic_git.bb +1 -1
index bc7f072..ee26fb2 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen - DON'T PANIC theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-splash-theme-handy_git.bb +1 -1
index ac72e8c..170a2bd 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen - handy theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-splash-theme-logo_git.bb +1 -1
index da645fe..6d838b4 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen - SHR logo theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.1+gitr${SRCREV}"
+PV = "0.1+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-splash-theme-niebiee_git.bb +1 -1
index 100d9ea..0a4f266 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen - extremely blue Niebiee theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-splash-theme-simple_git.bb +1 -1
index 5c18e43..f873a30 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen - simple SHR theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-splash-theme-tux_git.bb +1 -1
index 05d5baa..b7c513d 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen - SHR Tux theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.1+gitr${SRCREV}"
+PV = "0.1+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-splash_git.bb +1 -1
index 6d0e92f..7686dc4 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SHR splash screen"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "0375bf2b66a053dd490774004c56b5d949f02ac8"
-PV = "1.2+gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r5"
 DEPENDS = "virtual/shr-splash-theme"
 RRECOMMENDS = "virtual/shr-splash-theme"
recipes/shr/shr-theme-gtk-e17lookalike_git.bb +1 -1
index efd8857..7004262 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "A gtk theme that looks like e17"
 LICENSE = "MIT BSD"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.1.1+gitr${SRCREV}"
+PV = "0.1.1+gitr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/shr/shr-theme_git.bb +1 -1
index 16e5444..52a9b3c 100644
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/data"
 
 SRCREV = "730da87ad75c814c16c856ca138605d985b6efdb"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r2"
 
 inherit autotools
recipes/shr/shr-today_git.bb +1 -1
index cd8ccd6..439dd77 100644
@@ -6,7 +6,7 @@ RDEPENDS = "python-edje python-dbus python-edbus python-ecore"
 SECTION = "x11/applications"
 
 SRCREV = "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r2"
 
 inherit distutils
recipes/shr/shr-wizard_git.bb +1 -1
index 7554fe3..aed5820 100644
@@ -5,7 +5,7 @@ DEPENDS = "e-wm"
 RDEPENDS = "python-elementary shr-settings python-phoneutils e-wm python-dbus python-edbus"
 SECTION = "x11/application"
 SRCREV = "24450cba257e7057045ad576530f158a03bd0f8b"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
 PR = "r1"
 
 inherit autotools
Signature · 1 line
1.7.0.4
#6 lore raw

PATCH 6/6 recipes: use SRCPV in few more git recipes

In reply to Martin Jansa

* sometimes without PE bump, because nobody complained that we were bumping SRCREV without PV changes and we were using SRCPV in our branch before
* please bump PE if you're using one of those and you need to increment PV, otherwise it will be "corrected" with next PV bump

---
 recipes/blipomoko/blipomoko_git.bb                 |    2 +-
 recipes/bt-configure/bt-configure_git.bb           |    2 +-
 recipes/dri/glamo-dri-tests_git.bb                 |    2 +-
 recipes/dri/libdrm_git.bb                          |    2 +-
 recipes/e17/illume-keyboards-shr_git.bb            |    2 +-
 recipes/efl1/e-wm-illume-dict-pl_git.bb            |    3 ++-
 recipes/efl1/libeflvala_svn.bb                     |    1 +
 recipes/evopedia/evopedia_git.bb                   |    2 +-
 recipes/ffalarms/ffalarms_git.bb                   |    2 +-
 recipes/litephone/litephone_git.bb                 |    2 +-
 recipes/mplayer/mplayer_git.bb                     |    2 +-
 recipes/openmoko-3rdparty/advancedcaching_git.bb   |    2 +-
 recipes/openmoko-3rdparty/calc_git.bb              |    2 +-
 recipes/openmoko-3rdparty/jefliks_git.bb           |    2 +-
 recipes/openmoko-projects/om-locations_git.bb      |    3 ++-
 recipes/openmoko-projects/paroli_git.bb            |    2 +-
 recipes/openmoko-projects/tichy_git.bb             |    3 ++-
 recipes/openmoocow/openmoocow_git.bb               |    2 +-
 recipes/stopwatch/stopwatch_git.bb                 |    2 +-
 recipes/webkit/webkit-efl_git.bb                   |    2 +-
 recipes/xinput-calibrator/xinput-calibrator_git.bb |    2 +-
 recipes/xorg-driver/xf86-video-glamo_git.bb        |    4 ++--
 recipes/xorg-lib/libxcalibrate_git.bb              |    4 ++--
 recipes/xorg-lib/pixman_git.bb                     |    2 +-
 recipes/xorg-proto/calibrateproto_git.bb           |    4 ++--
 .../xserver-kdrive-glamo_1.3.0.0+git.bb            |    4 ++--
 recipes/xorg-xserver/xserver-xorg_git.bb           |    2 +-
 27 files changed, 34 insertions(+), 30 deletions(-)
recipes/blipomoko/blipomoko_git.bb +1 -1
index 2c7d582..ec57666 100644
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/dos1/blipomoko.git;protocol=http"
 S = "${WORKDIR}/git"
 
 SRCREV = "93295f36f7b45c691df247cb2a65227facf13654"
-PV = "0.0+gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
 PR = "r0"
 
 inherit distutils
recipes/bt-configure/bt-configure_git.bb +1 -1
index 74ef693..d2f056b 100644
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 RDEPENDS = "python python-pygtk bluez4"
 
 SRCREV = "9654c88ff74bca89cf747937cbec67421d2f1cbc"
-PV = "1.0.0+gitr${SRCREV}"
+PV = "1.0.0+gitr${SRCPV}"
 PR = "r1"
 
 ARCH_bt-configure = "all"
recipes/dri/glamo-dri-tests_git.bb +1 -1
index 5f46f44..1f9540b 100644
@@ -1,7 +1,7 @@
 DEPENDS = "libdrm virtual/libx11 libxext"
 
 SRCREV = "080b8db3d9dbfae38ebb00439887b5535ab1d380"
-PV = "1.0.0+gitr${SRCREV}"
+PV = "1.0.0+gitr${SRCPV}"
 
 SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master"
 
recipes/dri/libdrm_git.bb +1 -1
index b06ebe7..3f81cdd 100644
@@ -7,7 +7,7 @@ PROVIDES = "drm"
 DEPENDS = "libpthread-stubs virtual/kernel"
 
 PE = "1"
-PV = "2.4.18+gitr${SRCREV}"
+PV = "2.4.18+gitr${SRCPV}"
 PR = "r0"
 
 SRCREV = "a5c8f55397377994ceeb76ed0ff148ff89eb3a1b"
recipes/e17/illume-keyboards-shr_git.bb +1 -1
index 29273d5..90aab16 100644
@@ -4,7 +4,7 @@ SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;bra
 S = "${WORKDIR}/git"
 
 SRCREV = "9bd2c8f060c48eee3ab247838d8ecf2cf7082472"
-PV = "0.0+gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
 PE = "1"
 PR = "r3"
 
recipes/efl1/e-wm-illume-dict-pl_git.bb +2 -1
index 8a98b1c..736e721 100644
@@ -1,7 +1,8 @@
 DESCRIPTION = "Polish dictionary for Illume keyboard"
 SECTION = "x11/data"
 SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "1.0-gitr${SRCREV}"
+PV = "1.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
recipes/efl1/libeflvala_svn.bb +1 -0
index 56f8773..9a88054 100644
@@ -5,6 +5,7 @@ SECTION = "devel"
 DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary"
 PV = "0.5.0+svnr${SRCPV}"
 PR = "r0"
+PE = "1"
 SRCREV = "${EFL_SRCREV}"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=vala;proto=http"
recipes/evopedia/evopedia_git.bb +1 -1
index eaad256..4e26194 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RDEPENDS = "python python-xml python-shell python-netclient python-mime \
             python-netserver python-io python-compression"
 RRECOMMENDS = "midori"
-PV = "0.3.0-rc3+gitr${SRCREV}"
+PV = "0.3.0-rc3+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://github.com/crei/evopedia.git;protocol=http;branch=master"
recipes/ffalarms/ffalarms_git.bb +1 -1
index aef3211..f9d05b1 100644
@@ -7,7 +7,7 @@ LICENSE = "GPLv3"
 DEPENDS = "elementary libeflvala libical"
 RDEPENDS = "atd alsa-utils-amixer ttf-dejavu-sans libical"
 RSUGGESTS = "mplayer alsa-utils-aplay frameworkd"
-PV = "0.4+gitr${SRCREV}"
+PV = "0.4+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master"
recipes/litephone/litephone_git.bb +1 -1
index e209a1c..4fc5441 100644
@@ -1,7 +1,7 @@
 require litephone.inc
 
 SRCREV = "4c9f16d9acc6cd18fc3f647b7e4f44a2d3bdd7b6"
-PV = "0.1+gitr${SRCREV}"
+PV = "0.1+gitr${SRCPV}"
 PR = "${INC_PR}.0"
 
 SRC_URI = "git://git.senfdax.de/git/litephone;protocol=http \
recipes/mplayer/mplayer_git.bb +1 -1
index c769610..f766e04 100644
@@ -34,7 +34,7 @@ ARM_INSTRUCTION_SET = "ARM"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PV = "0.0+1.0rc4+gitr${SRCREV}"
+PV = "0.0+1.0rc4+gitr${SRCPV}"
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "2"
recipes/openmoko-3rdparty/advancedcaching_git.bb +1 -1
index 73da336..f8f2fc2 100644
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.opkg.org/package_268.html"
 RDEPENDS = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json"
 SRCREV = "9c3661f5573d2dd712437f1590070153d12e4c02"
-PV = "0.1.2+gitr${SRCREV}"
+PV = "0.1.2+gitr${SRCPV}"
 
 SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master"
 
recipes/openmoko-3rdparty/calc_git.bb +1 -1
index 8e5e2af..9a21a2c 100644
@@ -6,7 +6,7 @@ LICENSE  = "MIT"
 RDEPENDS = "python-elementary python python-edbus"
 SECTION = "x11/application"
 SRCREV = "cff7c833d4fce0d39de0812bfc9ed9e0eb8fac09"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
recipes/openmoko-3rdparty/jefliks_git.bb +1 -1
index 87f0b34..363f20d 100644
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "edje-native elementary iksemel gnutls eet evas ecore eina"
 HOMEPAGE = "http://jefliks.sourceforge.net/"
 AUTHOR = "Phoenix Kayo <[email protected]>"
-PV = "0.0.2b+gitr${SRCREV}"
+PV = "0.0.2b+gitr${SRCPV}"
 PR = "r0"
 
 inherit autotools pkgconfig
recipes/openmoko-projects/om-locations_git.bb +2 -1
index 9d06423..fd009d6 100644
@@ -5,7 +5,8 @@ LICENSE = "GPL"
 DEPENDS = "eet evas edje ecore edbus etk"
 RDEPENDS_${PN} = "diversity-daemon"
 SRCREV = "942e88a1b689ffe3f11a2d982cce389cc965b2ec"
-PV = "0.2+gitr${SRCREV}"
+PV = "0.2+gitr${SRCPV}"
+PE = "1"
 PR = "r1.04"
 
 SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git"
recipes/openmoko-projects/paroli_git.bb +1 -1
index 8b071f7..251c258 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Paroli"
 SECTION = "x11"
 LICENSE = "GPL"
 SRCREV = "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
-PV = "0.2.1+gitr${SRCREV}"
+PV = "0.2.1+gitr${SRCPV}"
 PE = "1"
 PR = "r0"
 
recipes/openmoko-projects/tichy_git.bb +2 -1
index 656b645..09d83e8 100644
@@ -3,7 +3,8 @@ SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS += "python-pygame virtual/libsdl libsdl-image python-dbus python-pygobject"                                   
 SRCREV = "ab68d849502009cf3214df48ffa8075a10cc2177"
-PV = "0.2+gitr${SRCREV}"
+PV = "0.2+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 SRC_URI = "git://git.openmoko.org/git/tichy.git;protocol=git"
recipes/openmoocow/openmoocow_git.bb +1 -1
index 65497fe..79ec2c8 100644
@@ -4,7 +4,7 @@ AUTHOR = "Thomas White"
 LICENSE = "GPLv3"
 SECTION = "applications/games"
 SRCREV = "39648419825cddfea1cb1321e552a12b71fede14"
-PV = "0.0.3+gitr${SRCREV}"
+PV = "0.0.3+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.bitwiz.org.uk/openmoocow.git;protocol=git;branch=master"
recipes/stopwatch/stopwatch_git.bb +1 -1
index 22b69f9..a74e631 100644
@@ -6,7 +6,7 @@ HOMEPAGE = "http://git.senfdax.de"
 LICENSE = "GPL QPL"
 DEFAULT_PREFERRENCE = "-1"
 SRCREV = "89644b91e02151fc72989755f20c1ffb144ef5e2"
-PV = "1.3.1+gitr${SRCREV}"
+PV = "1.3.1+gitr${SRCPV}"
 PR = "r0"
 
 inherit qt4x11
recipes/webkit/webkit-efl_git.bb +1 -1
index 8f43396..3f437ca 100644
@@ -5,7 +5,7 @@ DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango \
            sqlite3 libxslt gperf-native libxt"
 
 SRCREV = "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
-PV = "1.1.11+gitr${SRCREV}"
+PV = "1.1.11+gitr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master \
recipes/xinput-calibrator/xinput-calibrator_git.bb +1 -1
index 8d3d4c4..13c6a46 100644
@@ -1,6 +1,6 @@
 require xinput-calibrator.inc
 
-PV = "0.6.0+gitr${SRCREV}"
+PV = "0.6.0+gitr${SRCPV}"
 
 SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git;branch=misclick"
 
recipes/xorg-driver/xf86-video-glamo_git.bb +2 -2
index 19c7591..c889485 100644
@@ -4,8 +4,8 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=m
 S = "${WORKDIR}/git"
 
 SRCREV = "77b6d1b7363d3ff28f063ed92c9ed47194f70b20"
-PV = "1.0.0+gitr${SRCREV}"
-PE = "1"
+PV = "1.0.0+gitr${SRCPV}"
+PE = "2"
 PR = "r4"
 
 do_configure_prepend() {
recipes/xorg-lib/libxcalibrate_git.bb +2 -2
index 8412c09..01201ba 100644
@@ -6,8 +6,8 @@ DEPENDS = "virtual/libx11 calibrateproto libxext"
 
 SRCREV = "209d83af61ed38a002c8096377deac292b3e396c"
 PR = "r1"
-PV = "0.0+${PR}+gitr${SRCREV}"
-PE = "2"
+PV = "0.0+${PR}+gitr${SRCPV}"
+PE = "3"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
 
recipes/xorg-lib/pixman_git.bb +1 -1
index 70886ed..04b6892 100644
@@ -1,7 +1,7 @@
 require pixman.inc
 PV = "0.17.13"
 PR = "${INC_PR}.0"
-PR_append = "+gitr${SRCREV}"
+PR_append = "+gitr${SRCPV}"
 
 SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
  
recipes/xorg-proto/calibrateproto_git.bb +2 -2
index d98198c..740c9e6 100644
@@ -4,8 +4,8 @@ DESCRIPTION = "Touchscreen calibration protocol"
 
 SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 PR = "r0"
-PV = "0.0+${PR}+gitr${SRCREV}"
-PE = "2"
+PV = "0.0+${PR}+gitr${SRCPV}"
+PE = "3"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
 S = "${WORKDIR}/git"
recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +2 -2
index d717456..7631075 100644
@@ -10,8 +10,8 @@ RDEPENDS_${PN} = "xserver-security-policy"
 PROVIDES = "virtual/xserver"
 
 SRCREV = "3f113f5f4dbaf14dee439eac8d510313fff3aafc"
-PE = "1"
-PV = "1.3.0.0+gitr${SRCREV}"
+PE = "2"
+PV = "1.3.0.0+gitr${SRCPV}"
 PR = "r3"
 
 COMPATIBLE_HOST = "arm.*-linux"
recipes/xorg-xserver/xserver-xorg_git.bb +1 -1
index 47e797c..1cacc2f 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PV = "1.7.999"
 PR = "${INC_PR}.0"
-PR_append = "+gitr${SRCREV}"
+PR_append = "+gitr${SRCPV}"
 PE = "2"
 
 DEFAULT_PREFERENCE = "-1"
Signature · 1 line
1.7.0.4
#7 lore raw
In reply to Martin Jansa
Quoted 11 lines · Martin Jansa

Please consider applying this patch series.

Proposed and discussed in [1], the main reason for NACK (multiple builders uploading to shared feeds) was resolved with bitbake patch [2] and it's enabled by default in PATCH 1/6. It needs bitbake 1.10 or master, but Koen confirmed yesterday that he is using 1.10 already.

People not using multiple builders or any of changed recipes don't need to upgrade their bitbake, just keep your tmp/cache dir even for rebuilds from scratch (as you already should, if you have ever used AUTOREV).

Quoted 8 lines

I'll keep SRCPV changes for other recipes in shr/unstable branch so maintainers of other recipes can move to SRCPV easily too.

WARNING: don't use BB_LOCALCOUNT_OVERRIDE with AUTOREV, it will make revision counter in PV constant and chaning SRCREV is not enough to ensure increasing PV.

[1] : http://www.mail-archive.com/[email protected]/msg01325.html
[2] : http://git.openembedded.org/cgit.cgi/bitbake/commit/?h=1.10&id=2f32735463159e9e42e03819d6b505dba49c7f17

No comment?

if nobody care then maybe we can push it even without BB_LOCALCOUNT_OVERRIDE enabled by default.
It will be closer to current state and whoever needs it, can enable it for his local.conf or distro easily,
without forcing AUTOREV people to enable it imediately after this push.

If there is no reply before ie sunday night, can I push it?

Regards,

#8 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 21 lines · Martin Jansa
Quoted 11 lines · Martin Jansa

Please consider applying this patch series.

Proposed and discussed in [1], the main reason for NACK (multiple builders uploading to shared feeds) was resolved with bitbake patch [2] and it's enabled by default in PATCH 1/6. It needs bitbake 1.10 or master, but Koen confirmed yesterday that he is using 1.10 already.

People not using multiple builders or any of changed recipes don't need to upgrade their bitbake, just keep your tmp/cache dir even for rebuilds from scratch (as you already should, if you have ever used AUTOREV).

Quoted 8 lines

I'll keep SRCPV changes for other recipes in shr/unstable branch so maintainers of other recipes can move to SRCPV easily too.

WARNING: don't use BB_LOCALCOUNT_OVERRIDE with AUTOREV, it will make revision counter in PV constant and chaning SRCREV is not enough to ensure increasing PV.

[1] : http://www.mail-archive.com/[email protected]/msg01325.html
[2] : http://git.openembedded.org/cgit.cgi/bitbake/commit/?h=1.10&id=2f32735463159e9e42e03819d6b505dba49c7f17

Quoted 7 lines

No comment?

if nobody care then maybe we can push it even without BB_LOCALCOUNT_OVERRIDE enabled by default.
It will be closer to current state and whoever needs it, can enable it for his local.conf or distro easily,
without forcing AUTOREV people to enable it imediately after this push.

BB_LOCALCOUNT_OVERRIDE should be enabled by default, autorev people are used to breakage.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLyCF7MkyGM64RGpERAqHPAJ4tD39hWTXCXmWcQQP5vBsqtpRObACfb9U7 H7tCZ4pDFGejbBj8lTXqgxQ=
=b58J
-----END PGP SIGNATURE-----