[meta-fsl-arm][PATCH 1/4] linux-imx.inc: Add support to include GIT hash in local version

[Otavio Salvador]

When SCMVERSION is 'y' the GIT version is include in the local version
along the value at LOCALVERSION setting.

Change-Id: I973c2d098910c88db6e26ee6006fadaa23c09204
Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---
recipes-kernel/linux/linux-imx.inc | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 6909582..06a10f1 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -5,12 +5,13 @@ DESCRIPTION = "Linux kernel for imx platforms"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

-INC_PR = "r30"
+INC_PR = "r31"

inherit kernel

# Put a local version until we have a true SRCREV to point to
-LOCALVERSION ?= "+yocto-${DATE}"
+LOCALVERSION ?= "+yocto"
+SCMVERSION ?= "y"

SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \
file://defconfig \
@@ -36,6 +37,12 @@ do_configure_prepend() {
kernel_conf_variable LOCALVERSION_AUTO n

sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
+
+ if [ "${SCMVERSION}" = "y" ]; then
+ # Add GIT revision to the local version
+ head=`git rev-parse --verify --short HEAD 2> /dev/null`
+ printf "%s%s" +g $head > ${S}/.scmversion
+ fi
}

# install nedded headers for imx-test compilation
--
1.7.2.5

[Otavio Salvador]

As we now include the GIT hash we don't need to use a date at local
version. We also fix the local version override for 'mxs' SoCs that
were not being used.

Change-Id: I796cb3a90b1ae879e807fe1580cb0e2f11f6cf4e

Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---

recipes-kernel/linux/linux-imx_2.6.35.3.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index e3bc570..7936674 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,7 +1,7 @@
# Copyright (C) 2011-2012 Freescale Semiconductor
# Released under the MIT license (see COPYING.MIT for the terms)

-PR = "${INC_PR}.14"
+PR = "${INC_PR}.15"

include linux-imx.inc

@@ -9,11 +9,11 @@ COMPATIBLE_MACHINE = "(mxs|mx5)"

# Revision of imx_2.6.35_10.12.01 branch
SRCREV_mxs = "0ea8cb9453379388f870f9b8d13269fb9dc0761c"
-LOCALVERSION = "-10.12.01+yocto-${DATE}"
+LOCALVERSION_mxs = "-10.12.01+yocto"

# Revision of imx_2.6.35_11.09.01 branch
SRCREV_mx5 = "b279c81dbdc42d22e7e77a59956e894f8f9f81aa"
-LOCALVERSION = "-11.09.01+yocto-${DATE}"
+LOCALVERSION_mx5 = "-11.09.01+yocto"

SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
--
1.7.2.5

[Otavio Salvador]

When playing video via HDMI, audio via SPDIF, the system may hang. This
patch is used to add SPBA as secondary clock of ASRC, ESAI,SPDIF.

Change-Id: I2ba44803245505cb7de739b961a0eea9f58a4b1f
Signed-off-by: Lily Zhang <r58...@freescale.com>

Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---

recipes-kernel/linux/linux-imx_2.6.35.3.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 7936674..5c90f8a 100644

--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,7 +1,7 @@
# Copyright (C) 2011-2012 Freescale Semiconductor
# Released under the MIT license (see COPYING.MIT for the terms)

-PR = "${INC_PR}.15"
+PR = "${INC_PR}.16"

include linux-imx.inc

@@ -12,7 +12,7 @@ SRCREV_mxs = "0ea8cb9453379388f870f9b8d13269fb9dc0761c"

LOCALVERSION_mxs = "-10.12.01+yocto"

# Revision of imx_2.6.35_11.09.01 branch

-SRCREV_mx5 = "b279c81dbdc42d22e7e77a59956e894f8f9f81aa"
+SRCREV_mx5 = "012a4b8a404f5c89c31e2d428d5e4c9eb3a70ec7"

LOCALVERSION_mx5 = "-11.09.01+yocto"

SRC_URI += "file://NFS-Fix-nfsroot-support.patch \

--
1.7.2.5

[Otavio Salvador]

As we now include the GIT hash we don't need to use a date at local
version.

Change-Id: I4e66dd8944b53e7b3d6532a1f43a0c36450730eb

Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---

recipes-kernel/linux/linux-imx_3.0.15.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx_3.0.15.bb b/recipes-kernel/linux/linux-imx_3.0.15.bb
index 3c14535..a3362dc 100644
--- a/recipes-kernel/linux/linux-imx_3.0.15.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.15.bb
@@ -3,10 +3,10 @@

include linux-imx.inc

-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"

COMPATIBLE_MACHINE = "(mx6)"

# Revision of 12.02.01 tag
SRCREV = "1e54cdcdb6940a58d5e09174410fe0fe28041fa3"
-LOCALVERSION = "-12.02.01+yocto-${DATE}"
+LOCALVERSION = "-12.02.01+yocto"
--
1.7.2.5

[Mahesh Mahadevan]

Looks good, please push.

Best regards,
-Mahesh