From 9385db2abc2edad048ea9ded2b5713e2dd0019aa Mon Sep 17 00:00:00 2001 From: BELOUARGA Mohamed Date: Tue, 12 Mar 2024 16:17:09 +0100 Subject: [PATCH] at91bootstrap: add support of *.cfg files Resolve the problem of support of .cfg configuration fragments. When a user adds a fragment.cfg to SRC_URI, it is expecetd that configuration is added to the final image, but it is not done. Signed-off-by: BELOUARGA Mohamed --- recipes-bsp/at91bootstrap/at91bootstrap.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/at91bootstrap/at91bootstrap.inc b/recipes-bsp/at91bootstrap/at91bootstrap.inc index b9c40305..0805aff2 100644 --- a/recipes-bsp/at91bootstrap/at91bootstrap.inc +++ b/recipes-bsp/at91bootstrap/at91bootstrap.inc @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=42f86d2f6fd17d1221c5c651b487a07 inherit cml1 deploy -DEPENDS += "bc-native python3-native" +DEPENDS += "bc-native python3-native kern-tools-native" AT91BOOTSTRAP_MACHINE ??= "${MACHINE}" @@ -94,6 +94,13 @@ do_configure() { bbfatal "No config files found" fi + # If .cfg files exist, merge them to .config file + # This allows recipes to add .cfg files to change or to add features + if [ -n "${@' '.join(find_cfgs(d))}" ]; then + oe_runmake -C ${S} O=${B} oldconfig + merge_config.sh -m "${B}/.config" ${@" ".join(find_cfgs(d))} + fi + cml1_do_configure }