From 201e9e97faa552e3456087e0d3bb6d011f6c1b7d Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 14 Apr 2019 18:58:14 +0200
Subject: [PATCH] Alpine shuffle

---
 runtimes/alpine/alpine_seoul_nova/installer/Tupfile |  4 +++-
 runtimes/alpine/media/standard/Tupfile              | 12 ------------
 runtimes/alpine/media/standard/iso.tup              |  2 --
 vm/alpine/media/standard-x86/Tupfile                |  3 +++
 vm/alpine/media/virtual-x86_64/Tupfile              |  2 +-
 vm/vbox5-nova/Tupfile                               |  2 +-
 vm/vbox5-nova/machine.vbox                          | 10 ----------
 vm/vbox5-nova/runtime                               |  4 +---
 8 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 runtimes/alpine/media/standard/Tupfile
 delete mode 100644 runtimes/alpine/media/standard/iso.tup
 create mode 100644 vm/alpine/media/standard-x86/Tupfile

diff --git a/runtimes/alpine/alpine_seoul_nova/installer/Tupfile b/runtimes/alpine/alpine_seoul_nova/installer/Tupfile
index 0faeb47da..1fa724e1b 100644
--- a/runtimes/alpine/alpine_seoul_nova/installer/Tupfile
+++ b/runtimes/alpine/alpine_seoul_nova/installer/Tupfile
@@ -1,5 +1,5 @@
 TARGET_NAME = installer-alpine_seoul_nova
-include ../../media/standard/iso.tup
+include ../../../../vm/alpine/version.tup
 include_rules
 
 : vm_seoul.cfg |> !collect_raw |>
@@ -15,5 +15,7 @@ PKG_DEPENDS += \
 	_/raw/alpine-standard-x86 \
 	_/raw/$(TARGET_NAME) \
 
+ISO_NAME = alpine-standard-$(ALPINE_VERSION)-x86.iso
+
 : runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
 : runtime |> !collect_pkg_runtime |>
diff --git a/runtimes/alpine/media/standard/Tupfile b/runtimes/alpine/media/standard/Tupfile
deleted file mode 100644
index 7fb5baf41..000000000
--- a/runtimes/alpine/media/standard/Tupfile
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET_NAME = alpine-standard-x86
-RAW_VERSION = 3.9.2
-include iso.tup
-include_rules
-
-: |> wget --quiet $(ISO_URL) -O %o |> $(RAW_DIR)/$(ISO_NAME)
-
-: $(RAW_DIR)/$(ISO_NAME) |> \
-	wget --quiet $(ISO_URL).asc -O %o; gpg --verify %o; \
-|> $(RAW_DIR)/$(ISO_NAME).asc
-
-: |> !raw |>
diff --git a/runtimes/alpine/media/standard/iso.tup b/runtimes/alpine/media/standard/iso.tup
deleted file mode 100644
index ed1e41fe6..000000000
--- a/runtimes/alpine/media/standard/iso.tup
+++ /dev/null
@@ -1,2 +0,0 @@
-ISO_NAME = alpine-standard-3.9.2-x86.iso
-ISO_URL = http://dl-cdn.alpinelinux.org/alpine/v3.9/releases/x86/$(ISO_NAME)
diff --git a/vm/alpine/media/standard-x86/Tupfile b/vm/alpine/media/standard-x86/Tupfile
new file mode 100644
index 000000000..f41ea952a
--- /dev/null
+++ b/vm/alpine/media/standard-x86/Tupfile
@@ -0,0 +1,3 @@
+RELEASE_TYPE = standard
+RELEASE_ARCH = x86
+include ../iso_rom_rules.tup
diff --git a/vm/alpine/media/virtual-x86_64/Tupfile b/vm/alpine/media/virtual-x86_64/Tupfile
index 283e2720f..f671695e3 100644
--- a/vm/alpine/media/virtual-x86_64/Tupfile
+++ b/vm/alpine/media/virtual-x86_64/Tupfile
@@ -1,3 +1,3 @@
-RELEASE_ARCH = x86_64
 RELEASE_TYPE = virt
+RELEASE_ARCH = x86_64
 include ../iso_rom_rules.tup
diff --git a/vm/vbox5-nova/Tupfile b/vm/vbox5-nova/Tupfile
index f738c01ce..693c80cd1 100644
--- a/vm/vbox5-nova/Tupfile
+++ b/vm/vbox5-nova/Tupfile
@@ -5,8 +5,8 @@ include_rules
 : |> !raw |>
 
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_BASE_NOVA) \
 	@(PUBLIC_SRC_INIT) \
+	@(PUBLIC_SRC_BASE_NOVA) \
 	@(PUBLIC_SRC_LIBC) \
 	@(PUBLIC_SRC_LIBICONV) \
 	@(PUBLIC_SRC_NIT_FB) \
diff --git a/vm/vbox5-nova/machine.vbox b/vm/vbox5-nova/machine.vbox
index 9c4349661..42d050159 100644
--- a/vm/vbox5-nova/machine.vbox
+++ b/vm/vbox5-nova/machine.vbox
@@ -8,11 +8,6 @@
       <HardDisks>
         <HardDisk uuid="{8e1b4241-2e6b-417d-8495-3afbaaecac87}" location="/secondary.vmdk" format="VMDK" type="Normal"/>
       </HardDisks>
-<!--
-      <DVDImages>
-        <Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}" location="installer.iso"/>
-      </DVDImages>
--->
     </MediaRegistry>
     <Hardware>
       <CPU count="4">
@@ -61,11 +56,6 @@
         <AttachedDevice type="HardDisk" port="1" device="0">
           <Image uuid="{8e1b4241-2e6b-417d-8495-3afbaaecac87}"/>
         </AttachedDevice>
-<!--
-        <AttachedDevice passthrough="false" type="DVD" port="3" device="0">
-          <Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}"/>
-        </AttachedDevice>
--->
       </StorageController>
     </StorageControllers>
   </Machine>
diff --git a/vm/vbox5-nova/runtime b/vm/vbox5-nova/runtime
index d965b51fd..5835bc4b2 100644
--- a/vm/vbox5-nova/runtime
+++ b/vm/vbox5-nova/runtime
@@ -15,8 +15,6 @@
 		<usb/>
 	</requires>
 
-	<provides> <nic/> </provides>
-
 	<content>
 		<rom label="init"/>
 		<rom label="libc.lib.so"/>
@@ -71,7 +69,7 @@
 			<provides>
 				<service name="Framebuffer" /> <service name="Input" />
 			</provides>
-			<config initial_width="800" initial_height="600" />
+			<config initial_width="848" initial_height="480" />
 			<route>
 				<service name="Nitpicker"> <parent label=""/> </service>
 				<any-service> <parent/> </any-service>