From be80331cf569588deec55103788371426cfe58cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 15:45:05 +0100 Subject: [PATCH] utils/genrandconfig: add ubi handling Add a custom case to make sure that a random configuration with an empty configuration file for ubi doesn't fail. ubinize: error!: no sections found the ini-file "/home/buildroot/autobuild/instance-2/output-1/build/ubinize.cfg" Fixes: - http://autobuild.buildroot.org/results/f678c17cc4df06fb2737467e769cd8f72a3ea420 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 283e6859f15473cc1d0b2eb336e1db6f4335b61b) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 60922e871c..846cf1aa9f 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -530,6 +530,12 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n') configlines.append('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=41610\n') + if 'BR2_TARGET_ROOTFS_UBI=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n')