From f5ba001bc98d1d0b0406cf31dc6b3c309405ce89 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:39:21 +0100 Subject: [PATCH 1/7] gitignore: sort alphabetically Fixes: 9c38c16437e9 ("can-calc-bit-timing: move into subdir") --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 97657b8..91e98f2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ GNUmakefile.in /aclocal.m4 /autom4te.cache/ +/calc-bit-timing/.dirstamp /config.log /config.status /config/autoconf/ @@ -22,7 +23,6 @@ GNUmakefile.in /config/m4/ltsugar.m4 /config/m4/ltversion.m4 /config/m4/lt~obsolete.m4 -/calc-bit-timing/.dirstamp /mcp251xfd/.dirstamp /asc2log From 9e57777ecd83cbbff21270fe0eaad2bc3bd2914e Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:39:39 +0100 Subject: [PATCH 2/7] gitignore: ignore isobusfs dirstamp Fixes: 42edaeaf52fd ("Implement ISOBUS File Server (FS) Interface as a Personal Project") --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 91e98f2..7143601 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ GNUmakefile.in /config/m4/ltsugar.m4 /config/m4/ltversion.m4 /config/m4/lt~obsolete.m4 +/isobusfs/.dirstamp /mcp251xfd/.dirstamp /asc2log From f5670b41d9f5f7723cd397d68bec7cb375ac41b5 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:42:38 +0100 Subject: [PATCH 3/7] makefile: isobus: don't link against libj1939 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dc3a4bd..3515abd 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ j1939spy: j1939spy.o libj1939.o j1939sr: j1939sr.o libj1939.o testj1939: testj1939.o libj1939.o -isobusfs-srv: libj1939.o lib.o \ +isobusfs-srv: lib.o \ isobusfs/isobusfs_cmn.o \ isobusfs/isobusfs_srv.o \ isobusfs/isobusfs_srv_cm.o \ @@ -177,7 +177,7 @@ isobusfs-srv: libj1939.o lib.o \ isobusfs/isobusfs_cmn_dh.o $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ -isobusfs-cli: libj1939.o lib.o \ +isobusfs-cli: lib.o \ isobusfs/isobusfs_cmn.o \ isobusfs/isobusfs_cli.o \ isobusfs/isobusfs_cli_cm.o \ From eb0e0a30d479b08e084e1990f97d56ce72968059 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:43:06 +0100 Subject: [PATCH 4/7] makefile: isobus: remove dependencies to libj1939.h Fixes: 42edaeaf52fd ("Implement ISOBUS File Server (FS) Interface as a Personal Project") --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3515abd..260e1dd 100644 --- a/Makefile +++ b/Makefile @@ -144,8 +144,8 @@ j1939cat.o: libj1939.h j1939spy.o: libj1939.h j1939sr.o: libj1939.h testj1939.o: libj1939.h -isobusfs_srv.o: libj1939.h lib.h -isobusfs_c.o: libj1939.h lib.h +isobusfs_srv.o: lib.h +isobusfs_c.o: lib.h canframelen.o: canframelen.h canbusload: canbusload.o canframelen.o From 8bdcccf1a1df3b84e4a3c7f94fd1446b3db08082 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:41:29 +0100 Subject: [PATCH 5/7] GNumakefile: isobus: don't link against libj1939 Fixes: 42edaeaf52fd ("Implement ISOBUS File Server (FS) Interface as a Personal Project") --- GNUmakefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/GNUmakefile.am b/GNUmakefile.am index 3ea593b..c5057c9 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -139,7 +139,6 @@ isobusfs_cli_SOURCES = \ isobusfs_cli_LDADD = \ libisobusfs.la \ - libj1939.la \ libcan.la isobusfs_srv_SOURCES = \ @@ -153,7 +152,6 @@ isobusfs_srv_SOURCES = \ isobusfs_srv_LDADD = \ libisobusfs.la \ - libj1939.la \ libcan.la j1939acd_LDADD = libj1939.la From d4712c6c5547907534d8754fc7f5c1ab2d58d46a Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:42:05 +0100 Subject: [PATCH 6/7] GNUmakefile: isobus: include scripts in tarball Fixes: 42edaeaf52fd ("Implement ISOBUS File Server (FS) Interface as a Personal Project") --- GNUmakefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GNUmakefile.am b/GNUmakefile.am index c5057c9..1f06437 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -154,6 +154,10 @@ isobusfs_srv_LDADD = \ libisobusfs.la \ libcan.la +EXTRA_DIST += \ + isobusfs/isobusfs_create_test_dirs.sh \ + isobusfs/isobusfs_create_test_file.sh + j1939acd_LDADD = libj1939.la j1939cat_LDADD = libj1939.la j1939spy_LDADD = libj1939.la From 50e3d46b8b33b501bf6552249bfb9a5e334ced6f Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 19 Feb 2024 09:40:31 +0100 Subject: [PATCH 7/7] cmake: fix build of isobusfs tools Reported-by: https://github.com/pschichtel Link: https://github.com/linux-can/can-utils/issues/497 Fixes: 42edaeaf52fd ("Implement ISOBUS File Server (FS) Interface as a Personal Project") --- CMakeLists.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0fbd4a..acfeb59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,11 +91,63 @@ add_executable(mcp251xfd-dump if(NOT ANDROID) list(APPEND PROGRAMS ${PROGRAMS_J1939}) - list(APPEND PROGRAMS ${PROGRAMS_ISOBUSFS}) add_library(j1939 STATIC libj1939.c ) + + add_library(isobusfs SHARED + isobusfs/isobusfs_cmn.c + isobusfs/isobusfs_cmn_dh.c + ) + + set(PUBLIC_HEADER_ISOBUSFS + isobusfs/isobusfs_cmn.h + isobusfs/isobusfs_cmn_cm.h + ) + + set_target_properties(isobusfs PROPERTIES + PUBLIC_HEADER "${PUBLIC_HEADER_ISOBUSFS}" + ) + + install(TARGETS isobusfs + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + add_executable(isobusfs-cli + isobusfs/isobusfs_cli.c + isobusfs/isobusfs_cli_cm.c + isobusfs/isobusfs_cli_dh.c + isobusfs/isobusfs_cli_fa.c + isobusfs/isobusfs_cli_selftests.c + isobusfs/isobusfs_cli_int.c + ) + + target_link_libraries(isobusfs-cli + PRIVATE isobusfs + PRIVATE can + ) + + add_executable(isobusfs-srv + isobusfs/isobusfs_srv.c + isobusfs/isobusfs_srv_cm.c + isobusfs/isobusfs_srv_cm_fss.c + isobusfs/isobusfs_srv_dh.c + isobusfs/isobusfs_srv_fa.c + isobusfs/isobusfs_srv_fh.c + isobusfs/isobusfs_srv_vh.c + ) + + target_link_libraries(isobusfs-srv + PRIVATE isobusfs + PRIVATE can + ) + + install(TARGETS + isobusfs-cli + isobusfs-srv + DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() add_library(can STATIC