package/openpowerlink: properly handle legacy options

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 <[email protected]>
Signed-off-by: Ricardo Martincoski <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>

diff --git a/Config.in.legacy b/Config.in.legacy
index 94d6ce19f53f3a20534be5671cfea01596d2338d..1a325f8139d14ab7086e28c63fcff8662ec4a67a 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -4443,19 +4443,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 1a3dd62acdfa806a614bf6639f2a48eeeb4aca05..ef59a04bafe4a7fd1f990f2828c2db8547881c43 100644 (file)
--- 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"