Patchwork [meta-fsl-ppc,dylan] linux-qoriq-sdk: append SDK version to kernel version

login
register
mail settings
Submitter Zhenhua Luo
Date May 22, 2013, 10:58 a.m.
Message ID <1369220315-29986-1-git-send-email-zhenhua.luo@freescale.com>
Download mbox | patch
Permalink /patch/50309/
State Accepted
Headers show

Comments

Zhenhua Luo - May 22, 2013, 10:58 a.m.
if SDK_VERSION is defined, append the sdk version string to kernel version,
this can make make the sdk version is explicit for users, expecially when same
kernel verison is used for different releases.

Backport from aa6cf806a88b36cc0228d0ae9c43e767a65d24ca in master.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 recipes-kernel/linux/linux-qoriq-sdk.bb |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Zhenhua Luo - May 23, 2013, 10:16 a.m.
Applied. 


Best Regards,

Zhenhua


> -----Original Message-----
> From: Luo Zhenhua-B19537
> Sent: Wednesday, May 22, 2013 6:59 PM
> To: meta-freescale@yoctoproject.org
> Cc: Liu Ting-B28495; Guo Chunrong-B40290; Yu Zongchun-B40527; Luo
> Zhenhua-B19537
> Subject: [meta-fsl-ppc dylan][PATCH] linux-qoriq-sdk: append SDK version
> to kernel version
> 
> if SDK_VERSION is defined, append the sdk version string to kernel
> version, this can make make the sdk version is explicit for users,
> expecially when same kernel verison is used for different releases.
> 
> Backport from aa6cf806a88b36cc0228d0ae9c43e767a65d24ca in master.
> 
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> ---
>  recipes-kernel/linux/linux-qoriq-sdk.bb |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-
> kernel/linux/linux-qoriq-sdk.bb
> index 45f615f..a015e49 100644
> --- a/recipes-kernel/linux/linux-qoriq-sdk.bb
> +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
> @@ -5,10 +5,9 @@ DESCRIPTION = "Linux kernel for Freescale platforms"
>  SECTION = "kernel"
>  LICENSE = "GPLv2"
> 
> -
>  require recipes-kernel/linux/linux-qoriq-sdk.inc
> 
> -PR = "r10"
> +PR = "r11"
> 
>  SRC_URI += "file://fix_getrusage_for_perf.patch \
>              file://0001-Enable-the-option-Automount-devtmpfs-at-dev-in-
> kerne.patch \ @@ -17,4 +16,9 @@ SRC_URI +=
> "file://fix_getrusage_for_perf.patch \
>  do_configure_prepend() {
>  	# copy desired defconfig so we pick it up for the real
> kernel_do_configure
>  	cp ${KERNEL_DEFCONFIG} ${B}/.config
> +
> +	# append sdk version in kernel version if SDK_VERSION is defined
> +	if [ -n "${SDK_VERSION}" ]; then
> +		echo "CONFIG_LOCALVERSION=\"-${SDK_VERSION}\"" >>
> ${S}/.config
> +	fi
>  }
> --
> 1.7.9.5

Patch

diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index 45f615f..a015e49 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -5,10 +5,9 @@  DESCRIPTION = "Linux kernel for Freescale platforms"
 SECTION = "kernel"
 LICENSE = "GPLv2"
 
-
 require recipes-kernel/linux/linux-qoriq-sdk.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI += "file://fix_getrusage_for_perf.patch \
             file://0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch \
@@ -17,4 +16,9 @@  SRC_URI += "file://fix_getrusage_for_perf.patch \
 do_configure_prepend() {
 	# copy desired defconfig so we pick it up for the real kernel_do_configure
 	cp ${KERNEL_DEFCONFIG} ${B}/.config
+
+	# append sdk version in kernel version if SDK_VERSION is defined
+	if [ -n "${SDK_VERSION}" ]; then
+		echo "CONFIG_LOCALVERSION=\"-${SDK_VERSION}\"" >> ${S}/.config
+	fi
 }