uboot: BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR -> legacy

PATCH New Frank Hunleth 2 participants 2 messages Apr 24, 2015 – Jul 19, 2015

Share & tools

Frank Hunleth

author

2015-04-24 19:18 UTC #0 lore raw

PATCH 1/1 uboot: BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR -> legacy

This changes BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR from deprecated to legacy. The added legacy handling will automatically copy the BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR setting to BR2_TARGET_UBOOT_PATCH, which should make upgrading configurations easier.

Thanks to Arnout for suggesting the switch to legacy.

Signed-off-by Frank Hunleth <[email protected]>

---
 Config.in.legacy     | 15 +++++++++++++++
 boot/uboot/Config.in | 12 ------------
 2 files changed, 15 insertions(+), 12 deletions(-)

Config.in.legacy +15 -0

index 70a9043..341d006 100644
@@ -107,6 +107,21 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.05"
 
+config BR2_TARGET_UBOOT_PATCH
+	default BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != ""
+
+config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
+	string "uboot: the custom patch dir option has been renamed"
+	help
+	  The option BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR has been renamed to
+	  BR2_TARGET_UBOOT_PATCH. Check that your configuration has been updated
+	  correctly and delete this string.
+
+config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR_WRAP
+	bool
+	default y if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != ""
+	select BR2_LEGACY
+
 config BR2_LINUX_KERNEL_EXT_RTAI_PATCH
 	bool "RTAI patch file path has been removed"
 	help

boot/uboot/Config.in +0 ~~-12~~

index 4f01499..acfbf5a 100644
@@ -70,18 +70,6 @@ config BR2_TARGET_UBOOT_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \
 		if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
 
-config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
-	string "custom patch dir"
-	depends on BR2_DEPRECATED_SINCE_2015_05
-	help
-	  If your board requires custom patches, add the path to the
-	  directory containing the patches here. The patches must be
-	  named uboot-<something>.patch.
-
-	  Most users may leave this empty
-
-	  NOTE: Use BR2_TARGET_UBOOT_PATCH instead.
-
 config BR2_TARGET_UBOOT_PATCH
 	string "Custom U-Boot patches"
 	help

Signature · 1 line

1.9.1

Arnout Vandecappelle

2015-07-19 20:42 UTC #1 lore raw

PATCH 1/1 uboot: BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR -> legacy

Quoted 8 lines · Frank Hunleth

This changes BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR from deprecated to legacy. The added legacy handling will automatically copy the BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR setting to BR2_TARGET_UBOOT_PATCH, which should make upgrading configurations easier.
Thanks to Arnout for suggesting the switch to legacy.
Signed-off-by Frank Hunleth <[email protected]>

Hi Frank,

Thanks for this patch, but since we didn't include it in 2015.05, it's too late
to change it now. So I've marked it as rejected in patchwork.

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF