From 42dcfcc58883a7a577879d8a4e3c4bdad50d879b Mon Sep 17 00:00:00 2001
From: Logan Gartner <logan@qtechofficial.com>
Date: Mon, 10 Aug 2020 20:39:42 -0600
Subject: [PATCH] You know

I already forgot what I changed
---
 build.sh                                  |  4 ++--
 export-image/04-finalise/01-run.sh        |  2 ++
 stage2/02-net-tweaks/00-packages          | 10 ++++++++--
 stage3/00-install-packages/00-packages    |  2 +-
 stage3/00-install-packages/00-packages-nr |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index e9f887a..ce6cdad 100755
--- a/build.sh
+++ b/build.sh
@@ -159,7 +159,7 @@ export ZIP_FILENAME="${ZIP_FILENAME:-"image_${IMG_DATE}-${IMG_NAME}"}"
 export SCRIPT_DIR="${BASE_DIR}/scripts"
 export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}"
 export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"}
-export DEPLOY_ZIP="${DEPLOY_ZIP:-1}"
+export DEPLOY_ZIP="${DEPLOY_ZIP:-0}"
 export LOG_FILE="${WORK_DIR}/build.log"
 
 export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi}
@@ -175,7 +175,7 @@ export ENABLE_SSH="${ENABLE_SSH:-0}"
 export LOCALE_DEFAULT="${LOCALE_DEFAULT:-en_US.UTF-8}"
 
 export KEYBOARD_KEYMAP="${KEYBOARD_KEYMAP:-us}"
-export KEYBOARD_LAYOUT="${KEYBOARD_LAYOUT:-English (QUILT_NO_DIFF_TIMESTAMPS)}"
+export KEYBOARD_LAYOUT="${KEYBOARD_LAYOUT:-English (US)}"
 
 export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-America/New_York}"
 
diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh
index 0864639..bc8ba7c 100755
--- a/export-image/04-finalise/01-run.sh
+++ b/export-image/04-finalise/01-run.sh
@@ -94,6 +94,8 @@ if [ "${DEPLOY_ZIP}" == "1" ]; then
 	zip "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip" \
 		"$(basename "${IMG_FILE}")"
 	popd > /dev/null
+elif [ "${DEPLOY_ZIP}" == "2" ]; then
+  xz -z -c "$IMG_FILE" > "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img.xz"
 else
 	cp "$IMG_FILE" "$DEPLOY_DIR"
 fi
diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages
index cc4a68e..0d98bd9 100644
--- a/stage2/02-net-tweaks/00-packages
+++ b/stage2/02-net-tweaks/00-packages
@@ -1,4 +1,10 @@
-wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek
+wpasupplicant
+wireless-tools
+firmware-atheros
+firmware-brcm80211
+firmware-libertas
+firmware-misc-nonfree
+firmware-realtek
 raspberrypi-net-mods
-dhcpcd5
 net-tools
+network-manager
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index a3a7de4..4b78ec2 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -11,7 +11,7 @@ raspberrypi-artwork
 policykit-1
 gvfs
 rfkill
-firefox-esr
+surf
 gldriver-test
 fonts-droid-fallback
 fonts-liberation2
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
index ffc324b..9e596cc 100644
--- a/stage3/00-install-packages/00-packages-nr
+++ b/stage3/00-install-packages/00-packages-nr
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
+xserver-xorg-video-fbdev xserver-xorg xorg xinit xserver-xorg-video-fbturbo
 mousepad
 lxde lxtask menu-xdg
 zenity xdg-utils