From cb0dd7ffd5429d659a1972e1028c4726e0af5e6b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 29 Jun 2017 20:06:16 -0600
Subject: [PATCH] Make travis build use packages from static.redox-os.org

---
 .travis.yml      | 9 +++------
 Makefile         | 8 ++++++++
 mk/config.mk     | 1 +
 mk/filesystem.mk | 2 +-
 mk/initfs.mk     | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e830624..335da2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,7 @@ before_install:
   fi
 - cd cookbook && ./setup.sh && cd ..
 script:
-- make clean &&
-  make build/harddrive.bin.gz build/livedisk.bin.gz build/livedisk.iso
+- make travis
 notifications:
   email: false
   webhooks: http://37.139.9.28:54863/travis
@@ -37,10 +36,8 @@ deploy:
   provider: releases
   api_key:
     secure: E5w3mgFbW4fAFNJn0FGcvwGKK33d+StC4izDX7dsGPxX/gwAsMnZqabDWpsrj8n/jFI5NdPzuyz4Ojkip4AXrEs0DWfX96d9CSWvJmWIirwwKhALnxZ5cqnHnBXY3wpk9k8MKpdODzKs3ZjM3pPug2jjjp2EHdrEV6iyc8LlnLAJutbtPpNJv0rJrx/TfCZRx70YWKQyx2Lfx5P6Vj+5yoYsKk+SHmKZlIQfj2E1cfC8+/w+fzc9CRTNhM9XFBisKnu9qql3nNhEW8VUNQ9FnltGpunmcTnCmsKzHPfs8Zv6kM/6y3wuoqxwPnIwRu+zsntkjM/eT7Zy3DtTBqJDjq+L5jov50QWOxzjUuFYMv0lAMeMC0PIGn0ECpFs546M+Wqvd7HKgabac0UhilEBPbinOdW+6aOOhbo+Fe2I2ec0XIGxlQpccQeWQUsjjOQ+6QuvnpPE+CbvQaVyrx27rVAkqD44cOP8xqOq2Es651J+Dt0O1OIhLdPB3FxOLCDpEIHU5Ojci1QbUxZgGKjShpo44nNqcTv7v71JrfzFSVG2pF9a35Mpo6bFEkzyQprOyrwH2fcnN+4jyxdJXzdNsgraXsQopWAB5cL/8i7SXMwHy9ivpFaX/zgoHQqpc1a4VjrmTtPA08rLORIllw9CplfvJNsmNmCi2aSeTXR06Xk=
-  file:
-  - build/harddrive.bin.gz
-  - build/livedisk.bin.gz
-  - build/livedisk.iso
+  file_glob: true
+  file: build/travis/*
   on:
     repo: redox-os/redox
     tags: true
diff --git a/Makefile b/Makefile
index 001d0ad..5cc5260 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,14 @@ include mk/filesystem.mk
 # Disk images
 include mk/disk.mk
 
+# Travis target
+travis: FORCE
+	make clean
+	INSTALLER_FLAGS= make build/harddrive.bin.gz build/livedisk.iso
+	mkdir build/travis
+	mv build/harddrive.bin.gz build/travis/redox_$(TRAVIS_TAG).bin.gz
+	mv build/livedisk.iso build/travis/redox_$(TRAVIS_TAG).iso
+
 # An empty target
 FORCE:
 
diff --git a/mk/config.mk b/mk/config.mk
index 43bdf72..2bcb528 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -1,5 +1,6 @@
 # Configuration
 ARCH?=x86_64
+INSTALLER_FLAGS?=--cookbook=cookbook
 
 # Per host variables
 UNAME := $(shell uname)
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index 71c5b61..9918a76 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -9,7 +9,7 @@ build/filesystem.bin: filesystem.toml build/kernel
 	sleep 2
 	pgrep redoxfs
 	cp build/kernel build/filesystem/kernel
-	cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $<
+	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $<
 	chown -R 0:0 build/filesystem
 	chown -R 1000:1000 build/filesystem/home/user
 	chmod -R uog+rX build/filesystem
diff --git a/mk/initfs.mk b/mk/initfs.mk
index d335f12..aee0d2e 100644
--- a/mk/initfs.mk
+++ b/mk/initfs.mk
@@ -1,3 +1,3 @@
 build/initfs.tag: initfs.toml
-	cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $<
+	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $<
 	touch $@