| Message ID | 20220810074547.2833007-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] utils/genrandconfig: improve ARM trusted firmware fixup | expand |
Hello Fabrice, +James in Cc as he did the initial genrandconfig fixups for arm-trusted-firmware. On Wed, 10 Aug 2022 09:45:47 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Improve commit 541e794a959914d1189570c3674908eb5db08ce8 by adding a > custom case to make sure that a random configuration with an empty > platform for arm-trusted-firmware doesn't fail: > > make_helpers/plat_helpers.mk:15: *** "Error: Unknown platform. Please use PLAT=<platform name> to specify the platform". Stop. > > Fixes: > - http://autobuild.buildroot.org/results/1b67220008223d1bcbe70b76d643f9d04362ba6b > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) I've applied to master. But if I'm not mistaken, this change means that arm-trusted-firmware will never be built by the autobuilders, as BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM will always be empty in the random configurations that are generated. This means that the rest of the arm-trusted-firmware fixups in genrandconfig are useless, no? Thanks! Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Improve commit 541e794a959914d1189570c3674908eb5db08ce8 by adding a > custom case to make sure that a random configuration with an empty > platform for arm-trusted-firmware doesn't fail: > make_helpers/plat_helpers.mk:15: *** "Error: Unknown platform. Please > use PLAT=<platform name> to specify the platform". Stop. > Fixes: > - http://autobuild.buildroot.org/results/1b67220008223d1bcbe70b76d643f9d04362ba6b > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2022.05.x, thanks.
diff --git a/utils/genrandconfig b/utils/genrandconfig index a00ff8ee8b..54eae42063 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -428,6 +428,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_TARBALL=y\n') configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION=""\n') + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM=""\n' in configlines: + return False; + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y\n' in configlines and \ 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=""\n' in configlines:
Improve commit 541e794a959914d1189570c3674908eb5db08ce8 by adding a custom case to make sure that a random configuration with an empty platform for arm-trusted-firmware doesn't fail: make_helpers/plat_helpers.mk:15: *** "Error: Unknown platform. Please use PLAT=<platform name> to specify the platform". Stop. Fixes: - http://autobuild.buildroot.org/results/1b67220008223d1bcbe70b76d643f9d04362ba6b Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+)