Merge 7815be8741 into ff90f4ec21

.github/workflows/compile.yml

@@ -146,20 +146,6 @@ jobs:
         podman exec -i stable cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=cmake/${toolchain}.cmake -DENABLE_WERROR=ON -B build-${toolchain}
         podman exec -i stable cmake --build build-${toolchain}
 
-    - name: Configure & Build with gcc (Makefile)
-      env:
-        cc: gcc
-      run: |
-        podman exec -i stable make CC=${cc}
-        podman exec -i stable make clean
-
-    - name: Configure & Build with clang (Makefile)
-      env:
-        cc: clang
-      run: |
-        podman exec -i stable make CC=${cc}
-        podman exec -i stable make clean
-
     - name: Show logs
       if: ${{ failure() }}
       run: |

Makefile

@@ -46,7 +46,6 @@ MAKEFLAGS := -k
 CFLAGS := -O2 -Wall -Wno-parentheses -Wsign-compare
 
 HAVE_FORK := $(shell ./check_cc.sh "$(CC)" fork_test.c)
-HAVE_LIBGPS := $(shell test -x "`which pkg-config`" && pkg-config --exists libgps && echo 1 || echo 0)
 
 CPPFLAGS += \
 	-I. \
@@ -68,10 +67,8 @@ PROGRAMS_J1939_TIMEDATE := \
 	j1939-timedate-srv \
 	j1939-timedate-cli
 
-ifeq ($(HAVE_LIBGPS),1)
 PROGRAMS_J1939_VEHICLE_POSITION := \
 	j1939-vehicle-position-srv
-endif
 
 PROGRAMS_ISOBUSFS := \
 	isobusfs-srv \
@@ -197,7 +194,7 @@ j1939-vehicle-position-srv: \
 			lib.o \
 			libj1939.o \
 			j1939_vehicle_position/j1939_vehicle_position_srv.o
-		$(CC) $(LDFLAGS) $^ $(LDLIBS) $(shell pkg-config --libs libgps) -o $@
+		$(CC) $(LDFLAGS) $^ $(LDLIBS) -lgps -o $@
 
 isobusfs-srv:	lib.o \
 		libj1939.o \

README.md

@@ -29,7 +29,6 @@ subsystem (aka SocketCAN):
 * canbusload : calculate and display the CAN busload
 * can-calc-bit-timing : userspace version of in-kernel bitrate calculation
 * canfdtest : Full-duplex test program (DUT and host part)
-* canerrsim : CAN error message simulator
 
 #### ISO-TP tools [ISO15765-2:2016 for Linux](https://github.com/hartkopp/can-isotp)
 * isotpsend : send a single ISO-TP PDU
@@ -76,4 +75,4 @@ Follow the link to see examples on how this tools can be used:
 *   [SocketCAN Documentation (Linux Kernel)](https://www.kernel.org/doc/html/latest/networking/can.html)
 *   [Elinux.org CAN Bus Page](http://elinux.org/CAN_Bus)
 *   [Debian Package Description](https://packages.debian.org/sid/can-utils)
-*   [J1939 kernel module installation on Debian](can-j1939-install-kernel-module.md)
+