Patchwork [meta-fsl-ppc] linux-qoriq-sdk : add config fragments with merge_config.sh from kernel tree

login
register
mail settings
Submitter chunrong guo
Date Oct. 18, 2013, 6:23 a.m.
Message ID <1382077424-22149-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/60197/
State Accepted
Headers show

Comments

chunrong guo - Oct. 18, 2013, 6:23 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, 3 insertions(+), 3 deletions(-)
Otavio Salvador - Oct. 18, 2013, 3:11 p.m.
On Fri, Oct 18, 2013 at 3:23 AM,  <b40290@freescale.com> wrote:
> From: Chunrong Guo <B40290@freescale.com>
>
> Signed-off-by: Chunrong Guo <B40290@freescale.com>

Nack!

>  recipes-kernel/linux/linux-qoriq-sdk.bb |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
> index b7ca721..df18cfe 100644
> --- a/recipes-kernel/linux/linux-qoriq-sdk.bb
> +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
> @@ -11,7 +11,7 @@ SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
>
>  PR = "${INC_PR}.1"
>
> -DEPENDS_append = " libgcc kern-tools-native"
> +DEPENDS_append = " libgcc"

This seems completely wrong. Have you tried this using a clean 'tmp'
directory? I think it'd fail.

>  KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
>  KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
>
> @@ -20,8 +20,8 @@ do_configure_prepend() {
>         cp ${KERNEL_DEFCONFIG} ${B}/.config
>
>         # add config fragments
> -       if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then
> -               merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
> +       if [ -f "${DELTA_KERNEL_DEFCONFIG}" ]; then
> +               ${S}/scripts/kconfig/merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
>         fi
>
>         # append sdk version in kernel version if SDK_VERSION is defined
> --
> 1.7.5.4
>
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
Zhenhua Luo - Oct. 19, 2013, 8:01 a.m.
I think the intention is to use the merge_config.sh provided by built kernel, so the dependency is not needed anymore. 

The merge_config.sh provided by kern-tools-native and built kernel might be different. The change should make senses. 


Best Regards,

Zhenhua

> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Otavio Salvador
> Sent: Friday, October 18, 2013 11:12 PM
> To: Guo Chunrong-B40290
> Cc: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq-sdk : add
> config fragments with merge_config.sh from kernel tree
> 
> On Fri, Oct 18, 2013 at 3:23 AM,  <b40290@freescale.com> wrote:
> > From: Chunrong Guo <B40290@freescale.com>
> >
> > Signed-off-by: Chunrong Guo <B40290@freescale.com>
> 
> Nack!
> 
> >  recipes-kernel/linux/linux-qoriq-sdk.bb |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-
> kernel/linux/linux-qoriq-sdk.bb
> > index b7ca721..df18cfe 100644
> > --- a/recipes-kernel/linux/linux-qoriq-sdk.bb
> > +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
> > @@ -11,7 +11,7 @@ SRC_URI += "file://libtraceevent-Remove-hard-coded-
> include-to-usr-local-include-
> >
> >  PR = "${INC_PR}.1"
> >
> > -DEPENDS_append = " libgcc kern-tools-native"
> > +DEPENDS_append = " libgcc"
> 
> This seems completely wrong. Have you tried this using a clean 'tmp'
> directory? I think it'd fail.
> 
> >  KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
> >  KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
> >
> > @@ -20,8 +20,8 @@ do_configure_prepend() {
> >         cp ${KERNEL_DEFCONFIG} ${B}/.config
> >
> >         # add config fragments
> > -       if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then
> > -               merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
> > +       if [ -f "${DELTA_KERNEL_DEFCONFIG}" ]; then
> > +               ${S}/scripts/kconfig/merge_config.sh -m .config
> ${DELTA_KERNEL_DEFCONFIG}
> >         fi
> >
> >         # append sdk version in kernel version if SDK_VERSION is
> defined
> > --
> > 1.7.5.4
> >
> >
> > _______________________________________________
> > meta-freescale mailing list
> > meta-freescale@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-freescale
> 
> 
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
Otavio Salvador - Oct. 19, 2013, 12:46 p.m.
On Sat, Oct 19, 2013 at 5:01 AM, Luo Zhenhua-B19537
<B19537@freescale.com> wrote:
> I think the intention is to use the merge_config.sh provided by built kernel, so the dependency is not needed anymore.
>
> The merge_config.sh provided by kern-tools-native and built kernel might be different. The change should make senses.

No because this runs /before/ the build of the kernel so it will fail.

Otherwise I am missing something here...
chunrong guo - Oct. 21, 2013, 9:55 a.m.
Hello, 
I test this patch work well  in new environment.
Test step: 
1. add DELTA_KERNEL_DEFCONFIG  = "${S}/arch/powerpc/configs/asf.cfg"  in p4080ds.conf
2. add asf.cfg to ${S}/arch/powerpc/configs/
3. bitbake -c menuconfig Linux-qoriq-sdk

how do you test this ?

thanks,
chunrong

-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Saturday, October 19, 2013 8:46 PM
To: Luo Zhenhua-B19537
Cc: Guo Chunrong-B40290; meta-freescale@yoctoproject.org
Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq-sdk : add config fragments with merge_config.sh from kernel tree

On Sat, Oct 19, 2013 at 5:01 AM, Luo Zhenhua-B19537 <B19537@freescale.com> wrote:
> I think the intention is to use the merge_config.sh provided by built kernel, so the dependency is not needed anymore.
>
> The merge_config.sh provided by kern-tools-native and built kernel might be different. The change should make senses.

No because this runs /before/ the build of the kernel so it will fail.

Otherwise I am missing something here...
Zhenhua Luo - Oct. 21, 2013, 10:01 a.m.
Hi Otavio,

Following is the build process. 
1. do_patch installs the kernel source into ${S}, and merge_config.sh is available in ${S}/scripts/kconfig/ folder.
2. In do_configure task, ${S}/scripts/kconfig/merge_config.sh is called to merge delta kernel defconfig
3. go on subsequent steps

May I know what's the potential problem in your opinion?


Best Regards,

Zhenhua

> -----Original Message-----
> From: Guo Chunrong-B40290
> Sent: Monday, October 21, 2013 5:55 PM
> To: Otavio Salvador; Luo Zhenhua-B19537
> Cc: meta-freescale@yoctoproject.org
> Subject: RE: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq-sdk : add
> config fragments with merge_config.sh from kernel tree
> 
> Hello,
> I test this patch work well  in new environment.
> Test step:
> 1. add DELTA_KERNEL_DEFCONFIG  = "${S}/arch/powerpc/configs/asf.cfg"  in
> p4080ds.conf 2. add asf.cfg to ${S}/arch/powerpc/configs/ 3. bitbake -c
> menuconfig Linux-qoriq-sdk
> 
> how do you test this ?
> 
> thanks,
> chunrong
> 
> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On
> Behalf Of Otavio Salvador
> Sent: Saturday, October 19, 2013 8:46 PM
> To: Luo Zhenhua-B19537
> Cc: Guo Chunrong-B40290; meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq-sdk : add
> config fragments with merge_config.sh from kernel tree
> 
> On Sat, Oct 19, 2013 at 5:01 AM, Luo Zhenhua-B19537 <B19537@freescale.com>
> wrote:
> > I think the intention is to use the merge_config.sh provided by built
> kernel, so the dependency is not needed anymore.
> >
> > The merge_config.sh provided by kern-tools-native and built kernel
> might be different. The change should make senses.
> 
> No because this runs /before/ the build of the kernel so it will fail.
> 
> Otherwise I am missing something here...
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
Otavio Salvador - Oct. 21, 2013, 11:16 a.m.
On Mon, Oct 21, 2013 at 8:01 AM, Luo Zhenhua-B19537
<B19537@freescale.com> wrote:
> Following is the build process.
> 1. do_patch installs the kernel source into ${S}, and merge_config.sh is available in ${S}/scripts/kconfig/ folder.
> 2. In do_configure task, ${S}/scripts/kconfig/merge_config.sh is called to merge delta kernel defconfig
> 3. go on subsequent steps
>
> May I know what's the potential problem in your opinion?

Oh right; you are doing it in the configure task, right.

So it should be fine.

Sorry for the noise.
Zhenhua Luo - Oct. 23, 2013, 10:17 a.m.
Applied in master and dora, thanks. 


Best Regards,

Zhenhua


> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On
> Behalf Of Otavio Salvador
> Sent: Monday, October 21, 2013 7:17 PM
> To: Luo Zhenhua-B19537
> Cc: Guo Chunrong-B40290; meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq-sdk : add
> config fragments with merge_config.sh from kernel tree
> 
> On Mon, Oct 21, 2013 at 8:01 AM, Luo Zhenhua-B19537 <B19537@freescale.com>
> wrote:
> > Following is the build process.
> > 1. do_patch installs the kernel source into ${S}, and merge_config.sh
> is available in ${S}/scripts/kconfig/ folder.
> > 2. In do_configure task, ${S}/scripts/kconfig/merge_config.sh is
> > called to merge delta kernel defconfig 3. go on subsequent steps
> >
> > May I know what's the potential problem in your opinion?
> 
> Oh right; you are doing it in the configure task, right.
> 
> So it should be fine.
> 
> Sorry for the noise.
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Patch

diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index b7ca721..df18cfe 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -11,7 +11,7 @@  SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
 
 PR = "${INC_PR}.1"
 
-DEPENDS_append = " libgcc kern-tools-native"
+DEPENDS_append = " libgcc"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
@@ -20,8 +20,8 @@  do_configure_prepend() {
 	cp ${KERNEL_DEFCONFIG} ${B}/.config
     
 	# add config fragments    
-    	if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then
-        	merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
+    	if [ -f "${DELTA_KERNEL_DEFCONFIG}" ]; then
+        	${S}/scripts/kconfig/merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
     	fi
 
 	# append sdk version in kernel version if SDK_VERSION is defined