From 64eb8c9c26db12c761caff71e50a7213c0f7b896 Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Wed, 4 Sep 2024 16:46:21 +0200 Subject: cml1: add do_savedefconfig Move the do_savedefconfig task definition from u-boot and kernel to cml1.bbclass. There are more recipes which use the kbuild framework and benefit from a do_savedefconfig task. (From OE-Core rev: 2b2ed48903e09196ee20da7f66b1d3689e4a4473) Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie --- meta/classes-recipe/cml1.bbclass | 7 +++++++ meta/classes-recipe/kernel.bbclass | 7 ------- meta/recipes-bsp/u-boot/u-boot.inc | 6 ------ 3 files changed, 7 insertions(+), 13 deletions(-) (limited to 'meta') diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index 03e5fe6f47..8c207daec4 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -113,3 +113,10 @@ do_showconfig() { } do_showconfig[nostamp] = "1" addtask showconfig after do_configure + +do_savedefconfig() { + bbplain "Saving defconfig to:\n${B}/defconfig" + oe_runmake -C ${B} savedefconfig +} +do_savedefconfig[nostamp] = "1" +addtask savedefconfig after do_configure diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index cdcc5e0032..a7c4bf0ef4 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -689,13 +689,6 @@ kernel_do_configure() { ${KERNEL_CONFIG_COMMAND} } -do_savedefconfig() { - bbplain "Saving defconfig to:\n${B}/defconfig" - oe_runmake -C ${B} savedefconfig -} -do_savedefconfig[nostamp] = "1" -addtask savedefconfig after do_configure - inherit cml1 pkgconfig # Need LD, HOSTLDFLAGS and more for config operations diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ed3822784e..9100964c73 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -31,12 +31,6 @@ UBOOT_INITIAL_ENV ?= "${PN}-initial-env" require u-boot-configure.inc -do_savedefconfig() { - bbplain "Saving defconfig to:\n${B}/defconfig" - oe_runmake -C ${B} savedefconfig -} -do_savedefconfig[nostamp] = "1" -addtask savedefconfig after do_configure UBOOT_ARCH_DIR = "${@'arm' if d.getVar('UBOOT_ARCH').startswith('arm') else d.getVar('UBOOT_ARCH')}" do_compile () { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then -- cgit v1.2.3-54-g00ecf