From fb10e52b6bf1a4978348226a35bef8c4c9a539f6 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sun, 23 Apr 2017 14:59:01 +0200
Subject: [PATCH 1/4] apply uefi_opt if we're building a uefi-enabled iso

---
 zlibs/iso | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zlibs/iso b/zlibs/iso
index 2cd3bdb..1871c09 100644
--- a/zlibs/iso
+++ b/zlibs/iso
@@ -102,6 +102,10 @@ iso_xorriso_build() {
 	notice "building iso..."
 	isoname="${image_name}-live.iso"
 
+	[[ -n "$mkefi" ]] && {
+	uefi_opt="-eltorito-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot"
+	}
+
 	mkdir -p $R/dist
 	pushd $workdir
 	sudo xorriso -as mkisofs -r -J -joliet-long -l \
@@ -113,6 +117,7 @@ iso_xorriso_build() {
 		-no-emul-boot \
 		-boot-load-size 4 \
 		-boot-info-table \
+		${=uefi_opt} \
 		-o $R/dist/$isoname \
 		binary || zerr
 	popd

From db35673fa3bf58ac329dd91d9b8aa772e788f952 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sun, 23 Apr 2017 15:03:22 +0200
Subject: [PATCH 2/4] same for iso_squash_strap

---
 zlibs/iso | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/zlibs/iso b/zlibs/iso
index 1871c09..b5440e0 100644
--- a/zlibs/iso
+++ b/zlibs/iso
@@ -88,10 +88,13 @@ iso_squash_strap() {
 
 	notice "creating squashfs out of strapdir"
 
+	[[ -n "$mkefi" ]] && uefi_opt="-Xbcj x86"
 	pushd $workdir
 	sudo mksquashfs $strapdir binary/live/filesystem.squashfs \
+		${=uefi_opt} \
 		-noappend -comp xz || zerr
 	popd
+	unset uefi_opt
 }
 
 iso_xorriso_build() {
@@ -121,6 +124,7 @@ iso_xorriso_build() {
 		-o $R/dist/$isoname \
 		binary || zerr
 	popd
+	unset uefi_opt
 }
 
 iso_setup_installer() {

From 8ad0d444e30374684f64168bf669ba5d235455d3 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sun, 23 Apr 2017 16:58:54 +0200
Subject: [PATCH 3/4] update the sources list if needed when unpacking the
 tarball

---
 zlibs/bootstrap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index a2ef358..f0d1e3e 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -148,6 +148,8 @@ bootstrap_tar_unpack() {
 		exit 1
 	fi
 
+	conf_print_sourceslist | sudo tee $strapdir/etc/apt/sources.list >/dev/null
+
 	cat <<EOF | sudo tee ${strapdir}/postunpack >/dev/null
 #!/bin/sh
 apt-get update

From 9461b3b87bceb2cb476becd7823058556ca88eb0 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sat, 15 Apr 2017 18:17:02 +0200
Subject: [PATCH 4/4] unpack the tarball now and then

---
 zlibs/bootstrap | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index f0d1e3e..ecd083d 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -116,7 +116,7 @@ bootstrap_tar_pack() {
 	local _dest=$(dirname $bootstrap_tgz)
 
 	if [[ -f $bootstrap_tgz ]]; then
-		act "tarball found already in $_dest"
+		notice "tarball found already in $_dest"
 	else
 		notice "Creating boostrap tarball in $bootstrap_tgz"
 		silly
@@ -138,14 +138,13 @@ bootstrap_tar_unpack() {
 	ckreq || return 1
 
 	if [[ -f "${unpath}/.keep" ]]; then
+		act "skipping tarball unpack"
+	else
+		sudo rm -rf ${unpath}
 		mkdir -p ${unpath}
 		silly
 		sudo tar xfp $bootstrap_tgz -C ${unpath}
 		sudo mkdir -p ${unpath}/{boot,dev,sys,proc}
-	else
-		error "no .keep file found. exiting..."
-		zerr
-		exit 1
 	fi
 
 	conf_print_sourceslist | sudo tee $strapdir/etc/apt/sources.list >/dev/null