* Prior to constructing the sourceipk, remove the config generated by the defconfig_builder to reduce confusion on the presence of two tisdk defconfigs. * Additionally, the defconfig_builder config may not match the config used in the build as KERNEL_CONFIG_FRAGMENTS may be used to alter the configuration.
Signed-off-by: Jacob Stiffler <j-stiff...@ti.com> --- meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc index 04b22ef..10ecf8e 100644 --- a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc +++ b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc @@ -7,6 +7,14 @@ CONFIG_NAME ?= "tisdk_${MACHINE}${ARAGO_KERNEL_SUFFIX}_defconfig" # defconfig thay may have been done by the sanitizer code. do_configure_append() { cp ${B}/.config ${S}/arch/${ARCH}/configs/${CONFIG_NAME} + + # Remove defconfig generated by defconfig_builder to avoid confusion. This + # may not match the config used in the build due to KERNEL_CONFIG_FRAGMENTS. + config=`cat ${WORKDIR}/defconfig | grep use-tisdk-config | cut -d= -f2` + if [ -n "$config" ] + then + rm ${S}/arch/${ARCH}/configs/${config}_defconfig + fi } # Move create_srcipk task so that the release defconfig is included. -- 2.7.4 _______________________________________________ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago