Skip to content

Commit 71d26a5

Browse files
raiden00plxiaoxiang781216
authored andcommitted
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.
1 parent 8b15b26 commit 71d26a5

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

canutils/candump/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
config CANUTILS_CANDUMP
77
tristate "SocketCAN candump tool"
88
default n
9-
depends on NET_CAN
10-
select CANUTILS_LIBCANUTILS
9+
depends on NET_CAN && CANUTILS_LIBCANUTILS
1110
---help---
1211
Enable the SocketCAN candump tool ported from
1312
https://github.com/linux-can/can-utils

canutils/cansend/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
config CANUTILS_CANSEND
77
tristate "SocketCAN cansend tool"
88
default n
9-
depends on NET_CAN
10-
select CANUTILS_LIBCANUTILS
9+
depends on NET_CAN && CANUTILS_LIBCANUTILS
1110
---help---
1211
Enable the SocketCAN cansend tool ported from
1312
https://github.com/linux-can/can-utils

canutils/libcanutils/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
config CANUTILS_LIBCANUTILS
77
bool "CAN-utils support library"
88
default n
9-
depends on NET_CAN && ALLOW_GPL_COMPONENTS
9+
depends on NET_CAN && ALLOW_BSD_COMPONENTS
1010
---help---
1111
Enable the CAN-utils support library ported from
1212
https://github.com/linux-can/can-utils

0 commit comments

Comments
 (0)