[thud] kernel: use olddefconfig as the primary target for KERNEL_CONFIG_COMMAND

Message ID 20190115130203.1829-1-ross.burton@intel.com
State New
Headers show
Series
  • [thud] kernel: use olddefconfig as the primary target for KERNEL_CONFIG_COMMAND
Related show

Commit Message

Ross Burton Jan. 15, 2019, 1:02 p.m.
From: Bruce Ashfield <bruce.ashfield@windriver.com>


As was warned by commit 312ee68752fa [kconfig: announce removal of
oldnoconfig if used], oldnoconfig has been removed from the 4.20 kernel.

So we switch our default mode to olddefconfig.

commit fb16d8912 [kconfig: replace 'oldnoconfig' with 'olddefconfig',
and keep the old name as an alias] introduced olddefconfig in the 3.10
kernel, we shuffle oldnoconfig to the fallback target.

The fallback mode allows kernels between 3.10 and the currently listed
oldest kernel of 3.2 to continue to configure.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Armin Kuster Jan. 15, 2019, 3:42 p.m. | #1
On 1/15/19 5:02 AM, Ross Burton wrote:
> From: Bruce Ashfield <bruce.ashfield@windriver.com>

>

> As was warned by commit 312ee68752fa [kconfig: announce removal of

> oldnoconfig if used], oldnoconfig has been removed from the 4.20 kernel.

>

> So we switch our default mode to olddefconfig.


This is sitting in stable/thud-next already.
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/thud-next&id=3845a72fc21f206ce546d1d421a097a97d97d928

thanks,
Armin
>

> commit fb16d8912 [kconfig: replace 'oldnoconfig' with 'olddefconfig',

> and keep the old name as an alias] introduced olddefconfig in the 3.10

> kernel, we shuffle oldnoconfig to the fallback target.

>

> The fallback mode allows kernels between 3.10 and the currently listed

> oldest kernel of 3.2 to continue to configure.

>

> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>  meta/classes/kernel.bbclass | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass

> index e04d2fe0043..880c5ef1728 100644

> --- a/meta/classes/kernel.bbclass

> +++ b/meta/classes/kernel.bbclass

> @@ -492,7 +492,7 @@ sysroot_stage_all () {

>  	:

>  }

>  

> -KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} oldnoconfig"

> +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" oldnoconfig"

>  

>  python check_oldest_kernel() {

>      oldest_kernel = d.getVar('OLDEST_KERNEL')


-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e04d2fe0043..880c5ef1728 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -492,7 +492,7 @@  sysroot_stage_all () {
 	:
 }
 
-KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} oldnoconfig"
+KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" oldnoconfig"
 
 python check_oldest_kernel() {
     oldest_kernel = d.getVar('OLDEST_KERNEL')