From c783ede3763e550355296665511bc1a50464560f Mon Sep 17 00:00:00 2001 From: frysee Date: Mon, 12 May 2025 16:02:49 +0200 Subject: [PATCH 1/3] Properly fail the build --- workspace/makefile | 1 + workspace/tg5040/makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/workspace/makefile b/workspace/makefile index c9f754ed0..bee20a7c2 100644 --- a/workspace/makefile +++ b/workspace/makefile @@ -15,6 +15,7 @@ endif .PHONY: all all: + set -e cd ./$(PLATFORM)/wifimanager && make cd ./$(PLATFORM)/libmsettings && make cd ./$(PLATFORM) && make early # eg. other libs diff --git a/workspace/tg5040/makefile b/workspace/tg5040/makefile index ef98a1076..db0b83897 100644 --- a/workspace/tg5040/makefile +++ b/workspace/tg5040/makefile @@ -19,6 +19,7 @@ all: readmes cd show && make early: $(REQUIRES_EVTEST) $(REQUIRES_JSTEST) $(REQUIRES_UNZIP60) $(REQUIRES_FILEMGR) + set -e mkdir -p other cd $(REQUIRES_FILEMGR) && make -j cd $(REQUIRES_EVTEST) && $(CROSS_COMPILE)gcc -o evtest evtest.c From f0056768fcc6c32064d4af7a103b0db64edd8820 Mon Sep 17 00:00:00 2001 From: frysee Date: Mon, 12 May 2025 17:23:43 +0200 Subject: [PATCH 2/3] Not sure why we have linker issues here --- workspace/tg5040/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/tg5040/makefile b/workspace/tg5040/makefile index db0b83897..f7efcfb7e 100644 --- a/workspace/tg5040/makefile +++ b/workspace/tg5040/makefile @@ -21,7 +21,7 @@ all: readmes early: $(REQUIRES_EVTEST) $(REQUIRES_JSTEST) $(REQUIRES_UNZIP60) $(REQUIRES_FILEMGR) set -e mkdir -p other - cd $(REQUIRES_FILEMGR) && make -j + cd $(REQUIRES_FILEMGR) && make cd $(REQUIRES_EVTEST) && $(CROSS_COMPILE)gcc -o evtest evtest.c cd $(REQUIRES_JSTEST) && $(CROSS_COMPILE)gcc -o jstest jstest.c cd $(REQUIRES_UNZIP60) && make -f unix/Makefile.trimuismart unzip From 6a427aa0b46eb5772a59af4e640d63acd86a66e5 Mon Sep 17 00:00:00 2001 From: frysee Date: Tue, 13 May 2025 00:06:24 +0200 Subject: [PATCH 3/3] Should be fixed in source repo, just trigger a build here --- workspace/tg5040/makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/workspace/tg5040/makefile b/workspace/tg5040/makefile index f7efcfb7e..b89037efb 100644 --- a/workspace/tg5040/makefile +++ b/workspace/tg5040/makefile @@ -19,7 +19,6 @@ all: readmes cd show && make early: $(REQUIRES_EVTEST) $(REQUIRES_JSTEST) $(REQUIRES_UNZIP60) $(REQUIRES_FILEMGR) - set -e mkdir -p other cd $(REQUIRES_FILEMGR) && make cd $(REQUIRES_EVTEST) && $(CROSS_COMPILE)gcc -o evtest evtest.c