deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/openjdk: properly handle legacy for renamed options 

Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12"
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 2021.11, following the example described in
the beginning of the file.

Cc: Tudor Holton <buildroot@tudorholton.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a97a4a74aa)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022.11.x
Ricardo Martincoski 2022-11-27 10:07:36 -03:00 committed by Peter Korsgaard
parent 8c573c30a2
commit 0734a1da83
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -716,18 +716,20 @@ comment "Legacy options removed in 2021.11"
config BR2_OPENJDK_VERSION_LTS
bool "OpenJDK LTS version was renamed to OpenJDK 11"
select BR2_LEGACY
select BR2_PACKAGE_OPENJDK_VERSION_11
help
The LTS version option was renamed to OpenJDK 11 to make it
clear what LTS version is.
# Note: BR2_OPENJDK_VERSION_LTS is still referenced from
# package/openjdk/Config.in
config BR2_OPENJDK_VERSION_LATEST
bool "OpenJDK latest version (16.x) was removed"
select BR2_LEGACY
select BR2_PACKAGE_OPENJDK_VERSION_17
help
OpenJDK 16.x is no longer mainted, so the option has been
removed. Use OpenJDK 17.x instead.
# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from
# package/openjdk/Config.in
config BR2_PACKAGE_MPD_TIDAL
bool "mpd tidal option removed"

2
package/openjdk/Config.in
View File

@ -57,6 +57,8 @@ if BR2_PACKAGE_OPENJDK
choice
prompt "openjdk version"
default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy
default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy
default BR2_PACKAGE_OPENJDK_VERSION_17
help
Select the version of OpenJDK you wish to use.