[meta-fsl-ppc][PATCH] linux-qoriq: use correct path to access config2:w fragments


Adrian Dudau
 

Config fragments passed through SRC_URI are installed in $WORKDIR but
the recipe is looking for them in the current directory which in this
case is different.

Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index d28e75d..80edede 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -24,8 +24,8 @@ do_configure_prepend() {

# add config fragments
for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
- if [ -f "${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+ if [ -f "${WORKDIR}/${deltacfg}" ]; then
+ ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
${S}/scripts/kconfig/merge_config.sh -m .config \
${S}/arch/powerpc/configs/${deltacfg}
--
1.9.1


Ting Liu
 

-----Original Message-----
From: meta-freescale-bounces@... [mailto:meta-freescale-
bounces@...] On Behalf Of Adrian Dudau
Sent: Wednesday, February 24, 2016 6:40 PM
To: meta-freescale@...
Subject: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use correct
path to access config2:w fragments

Config fragments passed through SRC_URI are installed in $WORKDIR but the
recipe is looking for them in the current directory which in this case is
different.

Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-
qoriq.inc
index d28e75d..80edede 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -24,8 +24,8 @@ do_configure_prepend() {

# add config fragments
for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
- if [ -f "${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
[Liu Ting-B28495] this is intended to merge the config fragments with absolute path. The config fragments can be outside of Yocto layers.

+ if [ -f "${WORKDIR}/${deltacfg}" ]; then
+ ${S}/scripts/kconfig/merge_config.sh -m .config
+ ${WORKDIR}/${deltacfg}
[Liu Ting-B28495] This looks fine to merge the config fragments that passed through SRC_URI.

elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
${S}/scripts/kconfig/merge_config.sh -m .config \
${S}/arch/powerpc/configs/${deltacfg}
--
1.9.1

--
_______________________________________________
meta-freescale mailing list
meta-freescale@...
https://lists.yoctoproject.org/listinfo/meta-freescale


Zhenhua Luo
 

Hi Adrian,

The patch breaks the kernel build of machines in meta-fsl-ppc layer, can you please add the support for defconfig which is maintained in Yocto instead of replacing the absolute path defconfig support?


Best Regards,

Zhenhua

-----Original Message-----
From: meta-freescale-bounces@... [mailto:meta-freescale-
bounces@...] On Behalf Of Adrian Dudau
Sent: Wednesday, February 24, 2016 6:40 PM
To: meta-freescale@...
Subject: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use correct path
to access config2:w fragments

Config fragments passed through SRC_URI are installed in $WORKDIR but the
recipe is looking for them in the current directory which in this case is different.

Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-
qoriq.inc
index d28e75d..80edede 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -24,8 +24,8 @@ do_configure_prepend() {

# add config fragments
for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
- if [ -f "${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+ if [ -f "${WORKDIR}/${deltacfg}" ]; then
+ ${S}/scripts/kconfig/merge_config.sh -m .config
+ ${WORKDIR}/${deltacfg}
elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
${S}/scripts/kconfig/merge_config.sh -m .config \
${S}/arch/powerpc/configs/${deltacfg}
--
1.9.1

--
_______________________________________________
meta-freescale mailing list
meta-freescale@...
https://lists.yoctoproject.org/listinfo/meta-freescale


Adrian Dudau
 

On ons, 2016-02-24 at 13:39 +0000, Zhenhua Luo wrote:
Hi Adrian,

The patch breaks the kernel build of machines in meta-fsl-ppc layer, can you please add the support for defconfig which is maintained in Yocto instead of replacing the absolute path defconfig support?


Best Regards,

Zhenhua
Hi Zhenhua, Ting Liu,

I'm not trying to add an entire defconfig, I'm trying to add a config
fragment the Yocto recommended way
(http://www.yoctoproject.org/docs/latest/kernel-dev/kernel-dev.html#changing-the-configuration). So my use case is I have a linux-qoriq_%.bbappend where I add fragment.cfg to SRC_URI and to the DELTA_KERNEL_DEFCONFIG and I want the fragment to be picked up and applied over whatever defconfig the original recipe is using.

Reading your replies, it is my understanding that you have an internal
setup where you apply config fragments by appending the absolute path to
the DELTA_KERNEL_DEFCONFIG variable. Is that correct? If so, I can send
a v2 of the patch that accommodates both options.


best regards,
--Adrian


-----Original Message-----
From: meta-freescale-bounces@... [mailto:meta-freescale-
bounces@...] On Behalf Of Adrian Dudau
Sent: Wednesday, February 24, 2016 6:40 PM
To: meta-freescale@...
Subject: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use correct path
to access config2:w fragments

Config fragments passed through SRC_URI are installed in $WORKDIR but the
recipe is looking for them in the current directory which in this case is different.

Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-
qoriq.inc
index d28e75d..80edede 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -24,8 +24,8 @@ do_configure_prepend() {

# add config fragments
for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
- if [ -f "${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+ if [ -f "${WORKDIR}/${deltacfg}" ]; then
+ ${S}/scripts/kconfig/merge_config.sh -m .config
+ ${WORKDIR}/${deltacfg}
elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
${S}/scripts/kconfig/merge_config.sh -m .config \
${S}/arch/powerpc/configs/${deltacfg}
--
1.9.1

--
_______________________________________________
meta-freescale mailing list
meta-freescale@...
https://lists.yoctoproject.org/listinfo/meta-freescale


Zhenhua Luo
 

Hi Adrian,

Please send v2 to reserve the absolute kernel delta cfg support.


Best Regards,

Zhenhua

-----Original Message-----
From: Adrian Dudau [mailto:Adrian.Dudau@...]
Sent: Thursday, February 25, 2016 8:23 PM
To: Zhenhua Luo <zhenhua.luo@...>; Ting Liu <ting.liu@...>
Cc: meta-freescale@...
Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use correct
path to access config2:w fragments

On ons, 2016-02-24 at 13:39 +0000, Zhenhua Luo wrote:
Hi Adrian,

The patch breaks the kernel build of machines in meta-fsl-ppc layer, can you
please add the support for defconfig which is maintained in Yocto instead of
replacing the absolute path defconfig support?


Best Regards,

Zhenhua
Hi Zhenhua, Ting Liu,

I'm not trying to add an entire defconfig, I'm trying to add a config fragment the
Yocto recommended way (http://www.yoctoproject.org/docs/latest/kernel-
dev/kernel-dev.html#changing-the-configuration). So my use case is I have a
linux-qoriq_%.bbappend where I add fragment.cfg to SRC_URI and to the
DELTA_KERNEL_DEFCONFIG and I want the fragment to be picked up and
applied over whatever defconfig the original recipe is using.

Reading your replies, it is my understanding that you have an internal setup
where you apply config fragments by appending the absolute path to the
DELTA_KERNEL_DEFCONFIG variable. Is that correct? If so, I can send a v2 of
the patch that accommodates both options.


best regards,
--Adrian


-----Original Message-----
From: meta-freescale-bounces@...
[mailto:meta-freescale- bounces@...] On Behalf Of
Adrian Dudau
Sent: Wednesday, February 24, 2016 6:40 PM
To: meta-freescale@...
Subject: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use
correct path to access config2:w fragments

Config fragments passed through SRC_URI are installed in $WORKDIR
but the recipe is looking for them in the current directory which in this case
is different.

Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq.inc
b/recipes-kernel/linux/linux- qoriq.inc index d28e75d..80edede
100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -24,8 +24,8 @@ do_configure_prepend() {

# add config fragments
for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
- if [ -f "${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+ if [ -f "${WORKDIR}/${deltacfg}" ]; then
+ ${S}/scripts/kconfig/merge_config.sh -m .config
+ ${WORKDIR}/${deltacfg}
elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
${S}/scripts/kconfig/merge_config.sh -m .config \
${S}/arch/powerpc/configs/${deltacfg}
--
1.9.1

--
_______________________________________________
meta-freescale mailing list
meta-freescale@...
https://lists.yoctoproject.org/listinfo/meta-freescale