From 3fb4e35b33d42cb43c605d1e3d63ebbbfcb334e8 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 27 Nov 2022 10:07:37 -0300 Subject: [PATCH] package/sunxi-mali-utgard: properly handle legacy for renamed options Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit efc223abd4fe764f8af8238aec67e8cb700db45e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e9159782b8..6cc4f47609 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -470,20 +470,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module.