From e6a97ac797dafc17802fe66827e29a27313080a6 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 14 Mar 2014 10:08:57 +0100
Subject: [PATCH] linux-dey: use a common LOCALVERSION for DEY kernels

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/recipes-kernel/linux/linux-dey.inc          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb | 3 ---
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb      | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index bbd086ec2..0dd063a69 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -2,7 +2,7 @@
 
 require recipes-kernel/linux/linux-imx.inc
 
-LOCALVERSION ?= "+dey"
+LOCALVERSION = "-dey"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
 SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${KBRANCH}"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
index 820b1198d..079ee4a93 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
@@ -11,9 +11,6 @@ SRCREV_external = ""
 SRCREV_internal = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
-LOCALVERSION_mx5 = "mx5"
-LOCALVERSION_mxs = "mxs"
-
 KERNEL_CFG_FRAGS ?= ""
 KERNEL_CFG_FRAGS_append_mx5 = "file://config-sahara-module.cfg file://config-camera-module.cfg"
 KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accelerometer', 'file://config-accel-module.cfg', '', d)}"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
index 63cff7457..237fd14fb 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
@@ -13,8 +13,6 @@ SRCREV_external = ""
 SRCREV_internal = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
-LOCALVERSION_mxs = "mxs"
-
 # Kernel configuration fragments
 KERNEL_CFG_FRAGS ?= ""
 KERNEL_CFG_FRAGS_append = " ${@base_conditional('HAVE_EXAMPLE', '1' , 'file://config-spidev.cfg', '', d)}"