| Message ID | 20221127130739.1862398-19-ricardo.martincoski@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | check-symbols v2 | expand |
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > 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@gmail.com> > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Committed, thanks.
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > 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@gmail.com> > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Committed to 2022.11.x and 2022.02.x, thanks.
diff --git a/Config.in.legacy b/Config.in.legacy index 9ce1004b0c..e489458270 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4313,19 +4313,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"
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@gmail.com> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> --- test config 1: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP=y BR2_PACKAGE_OPENPOWERLINK=y BR2_TOOLCHAIN_BUILDROOT_CXX=y test config 2: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE=y BR2_PACKAGE_OPENPOWERLINK=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)