mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/sunxi-mali-utgard: properly handle legacy for renamed options

Browse Source 
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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit efc223abd4)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Ricardo Martincoski
2022-11-27 10:07:37 -03:00
committed by Peter Korsgaard
parent 0734a1da83
commit 4fa653b118
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@@ -645,20 +645,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE
config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2
bool "sunxi-mali-mainline-r6p2 was renamed" bool "sunxi-mali-mainline-r6p2 was renamed"
select BR2_LEGACY select BR2_LEGACY
select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2
help help
The sunxi-mali-mainline package has been renamed The sunxi-mali-mainline package has been renamed
sunxi-mali-utgard, the suboptions of this package have also sunxi-mali-utgard, the suboptions of this package have also
been renamed accordingly. 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 config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1
bool "sunxi-mali-mainline-r8p1 was renamed" bool "sunxi-mali-mainline-r8p1 was renamed"
select BR2_LEGACY select BR2_LEGACY
select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1
help help
The sunxi-mali-mainline package has been renamed The sunxi-mali-mainline package has been renamed
sunxi-mali-utgard, the suboptions of this package have also sunxi-mali-utgard, the suboptions of this package have also
been renamed accordingly. 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 config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
bool "qt5webkit-examples removed" bool "qt5webkit-examples removed"

2
package/sunxi-mali-utgard/Config.in
View File

@@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
choice choice
prompt "Version" 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 default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2
help help
Select the version of the userspace module. Select the version of the userspace module.