From a12245376dbb12b0d6187c318121c55aa6e3bfeb Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 19 Aug 2018 11:32:54 -0600
Subject: [PATCH] WIP: Fixes for running ci-pkg

---
 Makefile        | 11 +++---
 ci.toml         | 98 ++++++++++++++++++++++++-------------------------
 cookbook        |  2 +-
 filesystem.toml |  2 +-
 4 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/Makefile b/Makefile
index 5c99b62..fd47a43 100644
--- a/Makefile
+++ b/Makefile
@@ -70,11 +70,12 @@ ci-img: FORCE
 	cd build/img && sha256sum -b * > SHA256SUM
 
 # CI packaging target
-ci-pkg: FORCE
-	cd cookbook && ./fetch.sh \
-		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../ci.toml)"
-	cd cookbook && ./repo.sh \
-		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../ci.toml)"
+ci-pkg: prefix FORCE
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	PACKAGES="$$(cargo run --manifest-path installer/Cargo.toml -- --list-packages -c ci.toml)" && \
+	cd cookbook && \
+	./fetch.sh "$${PACKAGES}" && \
+	./repo.sh "$${PACKAGES}"
 
 # An empty target
 FORCE:
diff --git a/ci.toml b/ci.toml
index af8dd68..8cfb22e 100644
--- a/ci.toml
+++ b/ci.toml
@@ -5,85 +5,85 @@ prompt = false
 
 [packages]
 acid = {}
-autoconf = {}
-automake = {}
-bash = {}
-binutils = {}
+#autoconf = {}
+#automake = {}
+#bash = {}
+#binutils = {}
 ca-certificates = {}
 #cargo = {}
-cleye = {}
+#cleye = {}
 #cmatrix = {}
 contain = {}
 coreutils = {}
-curl = {}
-dash = {}
-diffutils = {}
-dosbox = {}
+#curl = {}
+#dash = {}
+#diffutils = {}
+#dosbox = {}
 drivers = {}
 #drivers-041 = {}
-duktape = {}
-expat = {}
+#duktape = {}
+#expat = {}
 extrautils = {}
 #fd = {}
-ffmpeg = {}
+#ffmpeg = {}
 findutils = {}
-freedoom = {}
-freetype = {}
+#freedoom = {}
+#freetype = {}
 game-2048 = {}
 games = {}
-gawk = {}
-gcc = {}
-generaluser-gs = {}
+#gawk = {}
+#gcc = {}
+#generaluser-gs = {}
 #gigalomania = {}
-git = {}
-gnu-binutils = {}
-gnu-grep = {}
-gnu-make = {}
+#git = {}
+#gnu-binutils = {}
+#gnu-grep = {}
+#gnu-make = {}
 init = {}
-installer = {}
+#installer = {}
 ion = {}
 ipcd = {}
-jansson = {}
+#jansson = {}
 keyboard-sfx = {}
-lci = {}
-libjpeg = {}
+#lci = {}
+#libjpeg = {}
 liborbital = {}
-libpng = {}
+#libpng = {}
 #libsodium = {}
 logd = {}
-lua = {}
-mdp = {}
-nasm = {}
-ncdu = {}
-ncurses = {}
-ncursesw = {}
+#lua = {}
+#mdp = {}
+#nasm = {}
+#ncdu = {}
+#ncurses = {}
+#ncursesw = {}
 netdb = {}
 netstack = {}
-netsurf = {}
+#netsurf = {}
 netutils = {}
-newlib = {}
-newlibtest = {}
+#newlib = {}
+#newlibtest = {}
 nulld = {}
-openssl = {}
-openttd = {}
-openttd-opengfx = {}
-openttd-openmsx = {}
+#openssl = {}
+#openttd = {}
+#openttd-opengfx = {}
+#openttd-openmsx = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
 pastel = {}
-patch = {}
+#patch = {}
 periodictable = {}
 #perl = {}
 pixelcannon = {}
 pkgutils = {}
 #powerline = {}
-prboom = {}
+#prboom = {}
 ptyd = {}
-python = {}
+#python = {}
 randd = {}
-readline = {}
+#readline = {}
 redoxfs = {}
 #redox-ssh = {}
 relibc = {}
@@ -94,19 +94,19 @@ rustual-boy = {}
 sdl = {}
 sdl_image = {}
 sdl_mixer = {}
-sed = {}
+#sed = {}
 shellstorm = {}
 smith = {}
 sodium = {}
 #ssh = {}
 terminfo = {}
 termplay = {}
-timidity = {}
+#timidity = {}
 ttf-hack = {}
 userutils = {}
 uutils = {}
-vim = {}
-vttest = {}
-xz = {}
+#vim = {}
+#vttest = {}
+#xz = {}
 zerod = {}
-zlib = {}
+#zlib = {}
diff --git a/cookbook b/cookbook
index 3c8ac89..c49323d 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit 3c8ac89d1acb662f56012470ecb8f6a95b1231a9
+Subproject commit c49323d8bc6920cee9fbfb0b4fce79423f89dab8
diff --git a/filesystem.toml b/filesystem.toml
index 46ca92b..31cc58c 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -16,7 +16,7 @@ ca-certificates = {}
 #cargo = {}
 #cleye = {}
 #cmatrix = {}
-#contain = {}
+contain = {}
 coreutils = {}
 #curl = {}
 #dash = {}