From 52d3d8a9f454315583d7761c9535d6f474d2b49c Mon Sep 17 00:00:00 2001 From: Jacob Pease Date: Sun, 6 Aug 2023 18:50:37 -0500 Subject: [PATCH] Stopped makefile from crashing when patch is already applied. --- linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Makefile b/linux/Makefile index 0c5d66a1d..28edebeda 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -70,7 +70,7 @@ $(WALLYBOARD): $(BUILDROOT) $(BUILDROOT)/package/fpga-axi-sdc: $(BUILDROOT) $(PATCHFILE) $(BRPACKAGES)/fpga-axi-sdc cp -r $(BRPACKAGES)/fpga-axi-sdc $(BUILDROOT)/package sed -i 's|FPGA_AXI_SDC_SITE =|FPGA_AXI_SDC_SITE = $(PACKAGE_SOURCE)|1' $(BUILDROOT)/package/fpga-axi-sdc/fpga-axi-sdc.mk - cd $(BUILDROOT); git apply $(PATCHFILE) + cd $(BUILDROOT); if git apply --check $(PATCHFILE) > /dev/null ; then git apply $(PATCHFILE); fi $(PATCHFILE): cd $(BUILDROOT); git apply $(PATCHFILE)