[Buildroot] [git commit branch/2022.11.x] package/openpowerlink: properly handle legacy options
Peter Korsgaard
peter at korsgaard.com
Wed Feb 22 16:46:56 UTC 2023
commit: https://git.buildroot.net/buildroot/commit/?id=9afadcbe5cef8346caa4fc6569c151dbabae43f6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x
Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" 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 2016.02, following the example described in
the beginning of the file.
Cc: Romain Naour <romain.naour at gmail.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
(cherry picked from commit e1e4f3950719dd92a2456e2c45856f8cf5dc587e)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
Config.in.legacy | 6 ++++--
package/openpowerlink/Config.in | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 98861137d2..5ffeb01af3 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -4327,19 +4327,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
bool "openpowerlink package has been updated"
select BR2_LEGACY
- select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB
help
openpowerlink kernel modules are built if the
kernel stack library is selected.
+# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from
+# package/openpowerlink/Config.in
config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP
bool "openpowerlink package has been updated"
select BR2_LEGACY
- select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB
help
The user space support has been split in two part:
- a monolithic user space library
- a user space daemon driver
+# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from
+# package/openpowerlink/Config.in
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "using the linux headers version for the kernel has been removed"
diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in
index 1a3dd62acd..ef59a04baf 100644
--- a/package/openpowerlink/Config.in
+++ b/package/openpowerlink/Config.in
@@ -38,6 +38,8 @@ endchoice
choice
prompt "stack type"
+ default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy
+ default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy
config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB
bool "linked into application"
More information about the buildroot
mailing list