From 71d26a5dd101e839eed79c8b121634e908e3a921 Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Sun, 27 Oct 2024 09:54:19 +0100 Subject: [PATCH] canutils: change dependency from GPL to BSD socketCAN utils are dual licence, there is no point in using GPL licence when we can use BSD. Also change `select CANUTILS_LIBCANUTILS` to `depends on CANUTILS_LIBCANUTILS`. We can't `select` that option when `ALLOW_BSD_COMPONENTS` is not set. --- canutils/candump/Kconfig | 3 +-- canutils/cansend/Kconfig | 3 +-- canutils/libcanutils/Kconfig | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/canutils/candump/Kconfig b/canutils/candump/Kconfig index 628cf5edc5..4359ec2877 100644 --- a/canutils/candump/Kconfig +++ b/canutils/candump/Kconfig @@ -6,8 +6,7 @@ config CANUTILS_CANDUMP tristate "SocketCAN candump tool" default n - depends on NET_CAN - select CANUTILS_LIBCANUTILS + depends on NET_CAN && CANUTILS_LIBCANUTILS ---help--- Enable the SocketCAN candump tool ported from https://github.com/linux-can/can-utils diff --git a/canutils/cansend/Kconfig b/canutils/cansend/Kconfig index 3084b17ac2..2bd446af51 100644 --- a/canutils/cansend/Kconfig +++ b/canutils/cansend/Kconfig @@ -6,8 +6,7 @@ config CANUTILS_CANSEND tristate "SocketCAN cansend tool" default n - depends on NET_CAN - select CANUTILS_LIBCANUTILS + depends on NET_CAN && CANUTILS_LIBCANUTILS ---help--- Enable the SocketCAN cansend tool ported from https://github.com/linux-can/can-utils diff --git a/canutils/libcanutils/Kconfig b/canutils/libcanutils/Kconfig index fad8fcd1b2..43dae4a001 100644 --- a/canutils/libcanutils/Kconfig +++ b/canutils/libcanutils/Kconfig @@ -6,7 +6,7 @@ config CANUTILS_LIBCANUTILS bool "CAN-utils support library" default n - depends on NET_CAN && ALLOW_GPL_COMPONENTS + depends on NET_CAN && ALLOW_BSD_COMPONENTS ---help--- Enable the CAN-utils support library ported from https://github.com/linux-can/can-utils