| Message ID | 20221127130739.1862398-24-ricardo.martincoski@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | check-symbols v2 | expand |
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > 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 <giulio.benetti@benettiengineering.com> > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Committed, thanks.
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > 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 <giulio.benetti@benettiengineering.com> > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Committed to 2022.11.x and 2022.02.x, thanks.
diff --git a/Config.in.legacy b/Config.in.legacy index 27f5602d19..ad2598f7a1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -631,20 +631,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.
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 <giulio.benetti@benettiengineering.com> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> --- test config 1: BR2_aarch64=y BR2_ARM_FPU_VFPV2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_SUNXI_MALI_MAINLINE=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1=y --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)