diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 4a83b95..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: ["https://www.buymeacoffee.com/aler9"] diff --git a/Makefile b/Makefile index 65cfc5b..4a3eb8f 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +UBUNTU_IMAGE = ubuntu:22.04 .PHONY: $(shell ls) diff --git a/scripts/format.mk b/scripts/format.mk index d1e981c..e52a2fa 100644 --- a/scripts/format.mk +++ b/scripts/format.mk @@ -1,5 +1,5 @@ define DOCKERFILE_FORMAT -FROM ubuntu:20.04 +FROM $(UBUNTU_IMAGE) RUN apt update && apt install -y --no-install-recommends \ clang-format diff --git a/scripts/lint.mk b/scripts/lint.mk index 4a999ca..6f0494a 100644 --- a/scripts/lint.mk +++ b/scripts/lint.mk @@ -1,5 +1,5 @@ define DOCKERFILE_LINT -FROM ubuntu:20.04 +FROM $(UBUNTU_IMAGE) RUN apt update && apt install -y --no-install-recommends \ clang-format diff --git a/test/Makefile b/test/Makefile index cbde82f..4e318f9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,3 +1,4 @@ +RPI_IMAGE = balenalib/raspberry-pi:bullseye all: build-cross @@ -5,7 +6,7 @@ build-direct: @$(MAKE) -f Makefile.src define DOCKERFILE -FROM balenalib/raspberry-pi-debian:stretch +FROM $(RPI_IMAGE) RUN apt-get update && apt-get install -y --no-install-recommends \ make \ gcc \ @@ -22,13 +23,3 @@ export DOCKERFILE build-cross: docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes >/dev/null echo "$$DOCKERFILE" | docker build ../ -f - -t temp - -TARGET ?= pi@192.168.2.170 -BIN = test-imu - -deploy: build-cross - ssh $(TARGET) "killall $(BIN) || exit 0" - docker run --rm temp cat /s/test/$(BIN) \ - | ssh $(TARGET) "tee ./$(BIN) >/dev/null" - ssh $(TARGET) "chmod +x ./$(BIN)" - ssh $(TARGET) "./$(BIN)" diff --git a/test/Makefile.src b/test/Makefile.src index 69ecfc5..7b698d5 100644 --- a/test/Makefile.src +++ b/test/Makefile.src @@ -1,4 +1,3 @@ - BIN = test-imu OBJECTS = \ @@ -16,7 +15,7 @@ LDFLAGS += all: $(BIN) $(BIN): $(OBJECTS) - gcc $(OBJECTS) $(LDFLAGS) -o $@ + $(CC) $(OBJECTS) $(LDFLAGS) -o $@ %.o: %.c - gcc $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@