From ad936987ccb40442a398b2832c8f314e08dcfd1c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Fri, 21 Jun 2013 11:54:49 +0200
Subject: [PATCH] ubl/u-boot: Use PKGV and PKGR instead of PV/PR for the
 AUTOINC

This should help in having no AUTOINC inside the uboot filename
but it doesn't fix it yet.
---
 recipes-sysmobts/ubl/ubl_git.bb            | 4 ++--
 recipes-sysmobts/uboot/u-boot_sysmocom.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-sysmobts/ubl/ubl_git.bb b/recipes-sysmobts/ubl/ubl_git.bb
index 9a3940e..83f61c6 100644
--- a/recipes-sysmobts/ubl/ubl_git.bb
+++ b/recipes-sysmobts/ubl/ubl_git.bb
@@ -9,14 +9,14 @@ LIC_FILES_CHKSUM = "file://ubl.c;beginline=1;endline=22;md5=806283bb3c475d9082e4
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/ubl;protocol=git;branch=master"
 SRCREV = "d04f24974a5b1e24cb9414ebc2e84a91848982c4"
 PV = "v0.2.11+git${SRCPV}"
-PR = "r2"
+PR = "r3"
 S = "${WORKDIR}/git"
 
 inherit deploy
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 
-UBL_IMAGE ?= "ubl-${MACHINE}-${PV}-${PR}.elf"
+UBL_IMAGE ?= "ubl-${MACHINE}-${PKGV}-${PKGR}.elf"
 UBL_SYMLINK ?= "ubl-${MACHINE}.elf"
 
 BOARD_NAME_sysmobts-v1 = "sysmobts_v1"
diff --git a/recipes-sysmobts/uboot/u-boot_sysmocom.inc b/recipes-sysmobts/uboot/u-boot_sysmocom.inc
index fbc385e..d6f10d1 100644
--- a/recipes-sysmobts/uboot/u-boot_sysmocom.inc
+++ b/recipes-sysmobts/uboot/u-boot_sysmocom.inc
@@ -13,7 +13,7 @@ UBOOT_MACHINE_sysmobts-v2 = "davinci_sysmobts_v2_config"
 UBOOT_MACHINE_sysmobts-2050 = "davinci_sysmobts_v2_config"
 COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmobts-2050)"
 
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PKGV}-${PKGR}"
 UBOOT_SYMLINK = "u-boot-${MACHINE}"
 
 do_deploy_prepend () {