path: root/Config.in.legacy
diff options
authorGravatar Danomi Manchego <danomimanchego123@gmail.com>2016-12-19 22:10:12 -0500
committerGravatar Peter Korsgaard <peter@korsgaard.com>2016-12-20 09:33:48 +0100
commitf61583fc2eb0ebf1d712581c2dae60e8fb692973 (patch)
tree6376ac00bb7ff8d6bb8f8b5ffe38f0523de1b98c /Config.in.legacy
parent62da71c980fe2e44059e4d6a7e00cbe279905a26 (diff)
uboot: fix custom patch dir legacy handling
Commit 3e3fef39e71ed0426130b36aa00e4630ebb537ae added new and improved patch handling, with BR2_TARGET_UBOOT_PATCH. This was in addition to the existing BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR option, that only handled directories. Later, commit 21b25d28fc7af3bb1b2c55e4a46e0d067ebc0081 moved the old BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR to legacy options. But on the way, bad things happened: * The original option was a string, while the one added to Config.in.legacy is a bool. This results in a warning from defconfigs that actually define the old BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR (because a string is not a valid value for a bool), but it does not result in the legacy option being selected. Consequently, BR2_LEGACY is not selected either. * The advice at the top of Config.in.legacy to add a hidden WRAP option to select BR2_LEGACY was not heeded. * The advice at the top of Config.in.legacy to use the old string option as the default for the new string option was not heeded. In this case, the variable was not just renamed, as the old option supported directories only, while the new one supports files too. But since the old option is a subset of the new option, it can still be used to set a useful default. So, this mod turns the legacy option back to a string, adds a hidden bool WRAP option to set BR2_LEGACY when the string is non emoty, and uses the legacy option to set the default for the new option. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'Config.in.legacy')
1 files changed, 9 insertions, 2 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 2811c7b76c..c8039ba9b9 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -567,12 +567,19 @@ config BR2_PACKAGE_QT5QUICK1
from upstream starting from Qt 5.6.
- bool "uboot custom patch dir removed"
- select BR2_LEGACY
+ string "uboot custom patch dir has been removed"
The uboot custom patch directory option has been removed. Use
the improved BR2_TARGET_UBOOT_PATCH option instead.
+ bool
+ default y if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != ""
+ select BR2_LEGACY
+# Note: BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR is still referenced from
+# boot/uboot/Config.in
bool "xf86-input-void removed"
select BR2_LEGACY