From dbbf43e945f61d37cdcee11665620d38537463f5 Mon Sep 17 00:00:00 2001
From: Dan Bungert <daniel.bungert@canonical.com>
Date: Fri, 4 Mar 2022 10:37:21 -0700
Subject: [PATCH 1/2] aptdeps: +cloud-init

---
 scripts/installdeps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/installdeps.sh b/scripts/installdeps.sh
index 534ee7de..690d6993 100755
--- a/scripts/installdeps.sh
+++ b/scripts/installdeps.sh
@@ -13,7 +13,7 @@ ConditionPathExists=/dev/zfs
 EOF
 cp -r /etc/systemd/system/zfs-mount.service.d/ /etc/systemd/system/zfs-share.service.d/
 systemctl daemon-reload
-apt-get install -o APT::Get::Always-Include-Phased-Updates=true -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel pep8 python3-pyflakes python3-bson make curl jq build-essential python3-pytest python3-async-timeout language-selector-common python3-pytest-xdist python3-aioresponses
+apt-get install -o APT::Get::Always-Include-Phased-Updates=true -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel pep8 python3-pyflakes python3-bson make curl jq build-essential python3-pytest python3-async-timeout language-selector-common python3-pytest-xdist python3-aioresponses cloud-init
 pip3 install -r requirements.txt
 
 make gitdeps

From c3a8285300953a05674ddcee3156b10b7f597744 Mon Sep 17 00:00:00 2001
From: Dan Bungert <daniel.bungert@canonical.com>
Date: Fri, 4 Mar 2022 10:34:49 -0700
Subject: [PATCH 2/2] aptdeps: move to external file

This info is redundant, and contained depends in one spot that were not
in the other.  Centralize.
---
 Makefile               |  8 +-------
 apt-deps.txt           | 40 ++++++++++++++++++++++++++++++++++++++++
 scripts/installdeps.sh |  5 ++++-
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 apt-deps.txt

diff --git a/Makefile b/Makefile
index 32a1269a..d2bee3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -25,13 +25,7 @@ all: dryrun
 .PHONY: aptdeps
 aptdeps:
 	sudo apt update && \
-	sudo apt-get install -y python3-urwid python3-pyudev python3-nose python3-flake8 \
-		python3-yaml python3-coverage python3-dev pkg-config libnl-genl-3-dev \
-		libnl-route-3-dev python3-attr python3-distutils-extra python3-requests \
-		python3-requests-unixsocket python3-jsonschema python3-apport \
-		python3-bson xorriso isolinux python3-aiohttp cloud-init ssh-import-id \
-		curl jq build-essential python3-pytest python3-async-timeout \
-	        language-selector-common fuseiso python3-pytest-xdist python3-aioresponses
+	sudo apt-get install -y $(shell cat apt-deps.txt)
 
 .PHONY: install_deps
 install_deps: aptdeps gitdeps
diff --git a/apt-deps.txt b/apt-deps.txt
new file mode 100644
index 00000000..8cfec862
--- /dev/null
+++ b/apt-deps.txt
@@ -0,0 +1,40 @@
+build-essential
+cloud-init
+curl
+fuseiso
+git
+isolinux
+jq
+language-selector-common
+libnl-3-dev
+libnl-genl-3-dev
+libnl-route-3-dev
+libsystemd-dev
+lsb-release
+pep8
+pkg-config
+python3-aiohttp
+python3-aioresponses
+python3-apport
+python3-async-timeout
+python3-attr
+python3-bson
+python3-coverage
+python3-dev
+python3-distutils-extra
+python3-flake8
+python3-jsonschema
+python3-nose
+python3-pip
+python3-pyflakes
+python3-pytest
+python3-pytest-xdist
+python3-pyudev
+python3-requests
+python3-requests-unixsocket
+python3-setuptools
+python3-urwid
+python3-wheel
+python3-yaml
+ssh-import-id
+xorriso
diff --git a/scripts/installdeps.sh b/scripts/installdeps.sh
index 690d6993..5311aecd 100755
--- a/scripts/installdeps.sh
+++ b/scripts/installdeps.sh
@@ -13,7 +13,10 @@ ConditionPathExists=/dev/zfs
 EOF
 cp -r /etc/systemd/system/zfs-mount.service.d/ /etc/systemd/system/zfs-share.service.d/
 systemctl daemon-reload
-apt-get install -o APT::Get::Always-Include-Phased-Updates=true -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel pep8 python3-pyflakes python3-bson make curl jq build-essential python3-pytest python3-async-timeout language-selector-common python3-pytest-xdist python3-aioresponses cloud-init
+apt-get install \
+    -o APT::Get::Always-Include-Phased-Updates=true \
+    -y --no-install-recommends \
+    $(cat apt-deps.txt)
 pip3 install -r requirements.txt
 
 make gitdeps