Patchwork [meta-fsl-ppc,v3] linux-qoriq-sdk : add config fragments

login
register
mail settings
Submitter chunrong guo
Date Oct. 16, 2013, 6:03 a.m.
Message ID <1381903437-9336-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/59991/
State Accepted
Headers show

Comments

chunrong guo - Oct. 16, 2013, 6:03 a.m.
From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-kernel/linux/linux-qoriq-sdk.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
Zhenhua Luo - Oct. 17, 2013, 3:33 a.m.
Applied in master and dora, thanks. 


Best Regards,

Zhenhua


> -----Original Message-----
> From: Guo Chunrong-B40290
> Sent: Wednesday, October 16, 2013 2:04 PM
> To: meta-freescale@yoctoproject.org
> Cc: Liu Ting-B28495; Luo Zhenhua-B19537; Guo Chunrong-B40290
> Subject: [meta-fsl-ppc][PATCH v3] linux-qoriq-sdk : add config fragments
> 
> From: Chunrong Guo <B40290@freescale.com>
> 
> Signed-off-by: Chunrong Guo <B40290@freescale.com>
> ---
>  recipes-kernel/linux/linux-qoriq-sdk.bb |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-
> kernel/linux/linux-qoriq-sdk.bb
> index 7dd7059..b7ca721 100644
> --- a/recipes-kernel/linux/linux-qoriq-sdk.bb
> +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
> @@ -11,13 +11,18 @@ SRC_URI += "file://libtraceevent-Remove-hard-coded-
> include-to-usr-local-include-
> 
>  PR = "${INC_PR}.1"
> 
> -DEPENDS_append = " libgcc"
> +DEPENDS_append = " libgcc kern-tools-native"
>  KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
>  KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
> 
>  do_configure_prepend() {
>  	# copy desired defconfig so we pick it up for the real
> kernel_do_configure
>  	cp ${KERNEL_DEFCONFIG} ${B}/.config
> +
> +	# add config fragments
> +    	if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then
> +        	merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
> +    	fi
> 
>  	# append sdk version in kernel version if SDK_VERSION is defined
>  	if [ -n "${SDK_VERSION}" ]; then
> --
> 1.7.5.4

Patch

diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index 7dd7059..b7ca721 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -11,13 +11,18 @@  SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
 
 PR = "${INC_PR}.1"
 
-DEPENDS_append = " libgcc"
+DEPENDS_append = " libgcc kern-tools-native"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
 do_configure_prepend() {
 	# copy desired defconfig so we pick it up for the real kernel_do_configure
 	cp ${KERNEL_DEFCONFIG} ${B}/.config
+    
+	# add config fragments    
+    	if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then
+        	merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
+    	fi
 
 	# append sdk version in kernel version if SDK_VERSION is defined
 	if [ -n "${SDK_VERSION}" ]; then