From a97a4a74aa993b09b958639e2276e7f5cf7a75d2 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 27 Nov 2022 10:07:36 -0300 Subject: [PATCH] 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 Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 42dbe6ef5a..53fe2f0b97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -832,18 +832,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" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8fbe51a27f..24a56e6b84 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -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.