From 333e3f0c285b737b9c75141fa1b61abaa1660317 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 24 Apr 2019 16:31:04 +0200
Subject: [PATCH] Move ISO fetchers

---
 .../Tupfile => vm/fetchers/Tuprules.tup       |  20 ++++++++----------
 vm/fetchers/alpine_x86_64/Tupfile             |   4 ++++
 vm/fetchers/nixos_x86_64/Tupfile              |   4 ++++
 {runtimes => vm}/fetchers/runtime.in          |   0
 vm/fetchers/ubuntu_x86_64/Tupfile             |   4 ++++
 vm/vbox_install_x86_64/Tupfile                |   5 +++++
 .../vbox_install_x86_64}/machine.vbox         |   4 ++--
 .../vbox_install_x86_64}/machine.vdi          | Bin
 8 files changed, 28 insertions(+), 13 deletions(-)
 rename runtimes/fetchers/fetch-nixos/Tupfile => vm/fetchers/Tuprules.tup (56%)
 create mode 100644 vm/fetchers/alpine_x86_64/Tupfile
 create mode 100644 vm/fetchers/nixos_x86_64/Tupfile
 rename {runtimes => vm}/fetchers/runtime.in (100%)
 create mode 100644 vm/fetchers/ubuntu_x86_64/Tupfile
 create mode 100644 vm/vbox_install_x86_64/Tupfile
 rename {runtimes/fetchers/fetch-nixos => vm/vbox_install_x86_64}/machine.vbox (97%)
 rename {runtimes/fetchers => vm/vbox_install_x86_64}/machine.vdi (100%)

diff --git a/runtimes/fetchers/fetch-nixos/Tupfile b/vm/fetchers/Tuprules.tup
similarity index 56%
rename from runtimes/fetchers/fetch-nixos/Tupfile
rename to vm/fetchers/Tuprules.tup
index 1d96ef6..dfb7ec2 100644
--- a/runtimes/fetchers/fetch-nixos/Tupfile
+++ b/vm/fetchers/Tuprules.tup
@@ -1,4 +1,10 @@
-TARGET_NAME = fetch_nixos
+ifeq ($(URL),)
+error URL not defined
+endif
+
+ifeq ($(SHA256),)
+error SHA256 not defined
+endif
 
 PKG_DEPENDS += \
 	@(SDK_USER)/src/init/@(SDK_VERSION) \
@@ -12,21 +18,13 @@ PKG_DEPENDS += \
 	@(PUBLIC_SRC_REPORT_ROM) \
 	@(PUBLIC_SRC_VFS_LWIP) \
 	@(PUBLIC_SRC_ZLIB) \
-	_/raw/$(TARGET_NAME) \
+	_/raw/vbox_install_x86_64 \
 	_/src/fetch_and_copy \
 
-include_rules
-
-URL = https://releases.nixos.org/nixos/18.09/nixos-18.09.2474.222950952f1/nixos-minimal-18.09.2474.222950952f1-x86_64-linux.iso
-SHA256 = ddc7041e185aaecc0d52f5d1c5124ef30db2bcf205f2be311b4328e4a5fff612
-
-: ../runtime.in |> ^ SED %o^ \
+: $(TUP_CWD)/runtime.in |> ^ SED %o^ \
 	sed \
 		-e 's|@URL@|$(URL)|' \
 		-e 's|@SHA256@|$(SHA256)|' \
 		%f > %o |> %B
 
-: machine.vbox |> !collect_raw |>
-: ../machine.vdi |> !collect_raw |>
-
 : runtime |> !collect_pkg_runtime |> {package}
diff --git a/vm/fetchers/alpine_x86_64/Tupfile b/vm/fetchers/alpine_x86_64/Tupfile
new file mode 100644
index 0000000..20b0871
--- /dev/null
+++ b/vm/fetchers/alpine_x86_64/Tupfile
@@ -0,0 +1,4 @@
+TARGET_NAME = fetch_alpine_x86_64
+URL = http://dl-cdn.alpinelinux.org/alpine/v3.9/releases/x86_64/alpine-virt-3.9.3-x86_64.iso
+SHA256 = 98e2eb7cfe74ede72d99cfd574a3c5e85a9aca5743d786abc9bbe7e0923f211b
+include_rules
diff --git a/vm/fetchers/nixos_x86_64/Tupfile b/vm/fetchers/nixos_x86_64/Tupfile
new file mode 100644
index 0000000..3e46753
--- /dev/null
+++ b/vm/fetchers/nixos_x86_64/Tupfile
@@ -0,0 +1,4 @@
+TARGET_NAME = fetch_nixos_x86_64
+URL = https://releases.nixos.org/nixos/19.03/nixos-19.03.172348.89354141608/nixos-minimal-19.03.172348.89354141608-x86_64-linux.iso
+SHA256 = 4d9b4de081d5e0bbe3c526aa93113710e2974791fd9b62851dc52d7a36366514
+include_rules
diff --git a/runtimes/fetchers/runtime.in b/vm/fetchers/runtime.in
similarity index 100%
rename from runtimes/fetchers/runtime.in
rename to vm/fetchers/runtime.in
diff --git a/vm/fetchers/ubuntu_x86_64/Tupfile b/vm/fetchers/ubuntu_x86_64/Tupfile
new file mode 100644
index 0000000..550eb43
--- /dev/null
+++ b/vm/fetchers/ubuntu_x86_64/Tupfile
@@ -0,0 +1,4 @@
+TARGET_NAME = fetch_ubuntu_x86_64
+URL = http://archive.ubuntu.com/ubuntu/dists/disco/main/installer-amd64/current/images/netboot/mini.iso
+SHA256 = 9c80874dbd5f583b32819921c2f44c0fe96050cfd77be1ed38738cb2ea3339eb
+include_rules
diff --git a/vm/vbox_install_x86_64/Tupfile b/vm/vbox_install_x86_64/Tupfile
new file mode 100644
index 0000000..9a8ba19
--- /dev/null
+++ b/vm/vbox_install_x86_64/Tupfile
@@ -0,0 +1,5 @@
+RAW_NAME = vbox_install_x86_64
+include_rules
+: machine.vbox |> !collect_raw |>
+: machine.vdi |> !collect_raw |>
+include $(RAW_RULES)
diff --git a/runtimes/fetchers/fetch-nixos/machine.vbox b/vm/vbox_install_x86_64/machine.vbox
similarity index 97%
rename from runtimes/fetchers/fetch-nixos/machine.vbox
rename to vm/vbox_install_x86_64/machine.vbox
index 242bd27..9761ad2 100644
--- a/runtimes/fetchers/fetch-nixos/machine.vbox
+++ b/vm/vbox_install_x86_64/machine.vbox
@@ -10,12 +10,12 @@
       </DVDImages>
     </MediaRegistry>
     <Hardware>
-      <CPU count="2">
+      <CPU count="4">
         <PAE enabled="true"/>
         <LongMode enabled="true"/>
         <HardwareVirtExLargePages enabled="false"/>
       </CPU>
-      <Memory RAMSize="1536"/>
+      <Memory RAMSize="2048"/>
       <HID Pointing="USBTablet"/>
       <Display VRAMSize="20"/>
       <RemoteDisplay enabled="false"/>
diff --git a/runtimes/fetchers/machine.vdi b/vm/vbox_install_x86_64/machine.vdi
similarity index 100%
rename from runtimes/fetchers/machine.vdi
rename to vm/vbox_install_x86_64/machine.vdi