From 9211cae97e2f287ebee1cef9a0f9c967025a1c31 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 6 Oct 2018 16:16:51 +0100
Subject: [PATCH] Don't try to sign or compress during builds

---
 src/freedombone-image-makefile | 40 +---------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index e2d4378df..0c83b4d73 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -41,13 +41,6 @@ IMAGE = $(NAME).img
 ARCHIVE = $(IMAGE).xz
 SIGNATURE = $(ARCHIVE).sig
 OWNER = 1000
-ifeq ($(CONTINUOUS_INTEGRATION), "")
-    XZ = xz --no-warn --verbose --keep --threads=0 -3 $(IMAGE)
-    SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
-else
-	XZ =
-	SIGN =
-endif
 
 # settings for `make test`
 TEST_SSH_PORT = 2222
@@ -95,9 +88,7 @@ beagleboneblack: prep
 	$(eval MACHINE = beagleboneblack)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build Beaglebone Green SD card image
@@ -106,9 +97,7 @@ beaglebonegreen: prep
 	$(eval MACHINE = beaglebonegreen)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build Beagleboard X15 SD card image
@@ -117,9 +106,7 @@ beaglex15: prep
 	$(eval MACHINE = beaglex15)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build Cubieboard2 SD card image
@@ -128,9 +115,7 @@ cubieboard2: prep
 	$(eval MACHINE = cubieboard2)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build Banana Pro SD card image
@@ -139,9 +124,7 @@ banana-pro: prep
 	$(eval MACHINE = banana-pro)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build PCDuino3 SD card image
@@ -150,9 +133,7 @@ pcduino3: prep
 	$(eval MACHINE = pcduino3)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build CubieTruck SD card image
@@ -161,9 +142,7 @@ cubietruck: prep
 	$(eval MACHINE = cubietruck)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build A20 OLinuXino Lime SD card image
@@ -173,9 +152,8 @@ a20-olinuxino-lime: prep
 	$(eval IMAGE = $(NAME).img)
 	$(MAKE_IMAGE)
 	rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
+	@echo "Build complete."
 
 # build A20 OLinuXino Lime2 SD card image
 a20-olinuxino-lime2: prep
@@ -183,9 +161,7 @@ a20-olinuxino-lime2: prep
 	$(eval MACHINE = a20-olinuxino-lime2)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build A20 OLinuXino Micro SD card image
@@ -194,9 +170,7 @@ a20-olinuxino-micro: prep
 	$(eval MACHINE = a20-olinuxino-micro)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build an i386 image
@@ -205,9 +179,7 @@ i386: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build an i686 image
@@ -216,9 +188,7 @@ i686: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build an amd64 image
@@ -227,9 +197,7 @@ amd64: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build an PC Engines APU image
@@ -238,9 +206,7 @@ apu: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 # build a qemu image
@@ -253,9 +219,7 @@ qemu-i386: prep
 	# Convert image to qemu format
 	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 qemu-x86_64: prep
@@ -265,9 +229,7 @@ qemu-x86_64: prep
 	# Convert image to qemu format
 	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
 	@rm -f $(ARCHIVE)
-	$(XZ)
 	@echo ""
-	$(SIGN)
 	@echo "Build complete."
 
 vendor/vmdebootstrap/vmdebootstrap: vendor-patches/vmdebootstrap/*.patch
-- 
GitLab