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

login
register
mail settings
Submitter chunrong guo
Date Oct. 16, 2013, 4:44 a.m.
Message ID <1381898686-6999-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/59977/
State Superseded
Headers show

Comments

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

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-kernel/linux/linux-qoriq-sdk.bb |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
Otavio Salvador - Oct. 16, 2013, 5:34 a.m.
On Wed, Oct 16, 2013 at 1:44 AM,  <b40290@freescale.com> wrote:
> From: Chunrong Guo <B40290@freescale.com>
>
> Signed-off-by: Chunrong Guo <B40290@freescale.com>
> ---
>  recipes-kernel/linux/linux-qoriq-sdk.bb |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
> index 7dd7059..c629bf6 100644
> --- a/recipes-kernel/linux/linux-qoriq-sdk.bb
> +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
> @@ -11,6 +11,7 @@ SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
>
>  PR = "${INC_PR}.1"
>
> +DEPENDS += "kern-tools-native"
>  DEPENDS_append = " libgcc"

Squash those.

>  KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
>  KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
> @@ -18,6 +19,11 @@ 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
>
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Patch

diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index 7dd7059..c629bf6 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -11,6 +11,7 @@  SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
 
 PR = "${INC_PR}.1"
 
+DEPENDS += "kern-tools-native"
 DEPENDS_append = " libgcc"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
@@ -18,6 +19,11 @@  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