From 344c2f75081801036850fdb0da8338d5df62e851 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 21 May 2019 13:03:48 +0200
Subject: [PATCH] Alpine + Seoul

---
 vm/alpine/alpine_seoul_nova/Tupfile           |  9 +--
 vm/alpine/alpine_seoul_nova/installer/Tupfile |  2 +-
 vm/alpine/alpine_seoul_nova/runtime           | 57 +++++++++++++------
 vm/alpine/alpine_seoul_nova/vm_seoul.cfg      | 38 -------------
 4 files changed, 43 insertions(+), 63 deletions(-)
 delete mode 100644 vm/alpine/alpine_seoul_nova/vm_seoul.cfg

diff --git a/vm/alpine/alpine_seoul_nova/Tupfile b/vm/alpine/alpine_seoul_nova/Tupfile
index a48a01c2b..87b78198b 100644
--- a/vm/alpine/alpine_seoul_nova/Tupfile
+++ b/vm/alpine/alpine_seoul_nova/Tupfile
@@ -1,16 +1,11 @@
 TARGET_NAME = alpine_seoul_nova
 include_rules
 
-: vm_seoul.cfg |> !collect_raw |>
-
 PKG_DEPENDS += \
 	@(PUBLIC_SRC_BASE_NOVA) \
 	@(PUBLIC_SRC_INIT) \
-	@(PUBLIC_SRC_NIT_FB) \
-	local/src/seoul-nova \
-	_/src/fs_block \
-	_/raw/$(TARGET_NAME) \
+	@(PUBLIC_SRC_SEOUL_NOVA) \
 
 : runtime |> !collect_pkg_runtime |>
 
-include $(RAW_RULES)
+include $(PKG_RULES)
diff --git a/vm/alpine/alpine_seoul_nova/installer/Tupfile b/vm/alpine/alpine_seoul_nova/installer/Tupfile
index 33f968064..3d34c6fcb 100644
--- a/vm/alpine/alpine_seoul_nova/installer/Tupfile
+++ b/vm/alpine/alpine_seoul_nova/installer/Tupfile
@@ -5,7 +5,7 @@ PKG_DEPENDS += \
 	@(PUBLIC_SRC_BASE_NOVA) \
 	@(PUBLIC_SRC_INIT) \
 	@(PUBLIC_SRC_ROM_BLOCK) \
-	local/src/seoul-nova \
+	@(PUBLIC_SRC_SEOUL_NOVA) \
 	_/raw/alpine-standard-x86 \
 
 IMAGE_NAME = alpine-standard-$(ALPINE_VERSION)-x86.iso
diff --git a/vm/alpine/alpine_seoul_nova/runtime b/vm/alpine/alpine_seoul_nova/runtime
index 17d985012..9a57a99fc 100644
--- a/vm/alpine/alpine_seoul_nova/runtime
+++ b/vm/alpine/alpine_seoul_nova/runtime
@@ -1,6 +1,7 @@
 <runtime ram="1380M" caps="2200" binary="init">
 
 	<requires>
+		<block/>
 		<file_system/>
 		<nic/>
 		<rom label="platform_info"/>
@@ -10,7 +11,6 @@
 	</requires>
 
 	<content>
-		<rom label="fs_block"/>
 		<rom label="init"/>
 		<rom label="nit_fb"/>
 		<rom label="seoul"/>
@@ -26,6 +26,7 @@
 			<service name="RM"/>
 			<service name="CPU"/>
 			<service name="LOG"/>
+			<service name="Block"/>
 			<service name="File_system"/>
 			<service name="Nitpicker"/>
 			<service name="Rtc"/>
@@ -51,18 +52,6 @@
 				<service name="Framebuffer" /> <service name="Input" />
 			</provides>
 			<config initial_width="640" initial_height="400"/>
-			<route>
-				<service name="Nitpicker"> <parent label=""/> </service>
-				<any-service> <parent/> </any-service>
-			</route>
-		</start>
-
-		<start name="fs_block" priority="-1">
-			<resource name="RAM" quantum="8M" />
-			<provides><service name="Block"/></provides>
-			<config>
-				 <default-policy file="alpine.disk" block_size="512" writeable="yes"/>
-			</config>
 			<route>
 				<any-service> <parent/> </any-service>
 			</route>
@@ -75,12 +64,46 @@
 				<service name="ROM" label="platform_info">
 					<parent label="platform_info"/> </service>
 				<service name="Timer">      <child name="timer"/></service>
-				<service name="Framebuffer"><child name="nit_fb"/></service>
-				<service name="Input">      <child name="nit_fb"/></service>
-				<service name="Block">      <child name="fs_block"/></service>
 				<any-service><parent/></any-service>
 			</route>
-			<configfile name="vm_seoul.cfg"/>
+			<config colocate="1">
+				<machine>
+					<mem start="0x0" end="0x9a000"/>
+					<mem start="0x100000" end="0xfffff000"/>
+					<!--<ioio/>-->
+					<nullio io_base="0x80" />
+					<pic io_base="0x20" elcr_base="0x4d0"/>
+					<pic io_base="0xa0" irq="2" elcr_base="0x4d1"/>
+					<pit io_base="0x40" irq="0"/>
+					<scp io_port_a="0x92" io_port_b="0x61"/>
+					<kbc io_base="0x60" irq_kbd="1" irq_aux="12"/>
+					<keyb ps2_port="0" host_keyboard="0x10000"/>
+					<mouse ps2_port="1" host_mouse="0x10001"/>
+					<rtc io_base="0x70" irq="8"/>
+					<serial io_base="0x3f8" irq="0x4" host_serial="0x4711"/>
+					<hostsink host_dev="0x4712" buffer="80"/>
+					<vga io_base="0x03c0"/>
+
+					<vbios_disk/>
+					<vbios_keyboard host_keyboard="0x10000"/>
+					<vbios_mem/>
+					<vbios_time/>
+					<vbios_reset/>
+
+					<msi/>
+					<ioapic/>
+					<pcihostbridge bus_num="0" bus_count="0x10" io_base="0xcf8"
+					               mem_base="0xe0000000"/>
+					<pmtimer io_port="0x8000"/>
+
+					<vcpu/> <halifax/> <vbios/> <lapic/>
+
+					<ahci mem="0xe0800000" irq="14" bdf="0x30"/>
+					<drive sigma0drive="0" controller="0" port="0"/>
+					<rtl8029 irq="9" port="0x300"/>
+				</machine>
+				<multiboot/>
+			</config>
 		</start>
 	</config>
 
diff --git a/vm/alpine/alpine_seoul_nova/vm_seoul.cfg b/vm/alpine/alpine_seoul_nova/vm_seoul.cfg
deleted file mode 100644
index af17c3137..000000000
--- a/vm/alpine/alpine_seoul_nova/vm_seoul.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-<config colocate="1">
-	<machine>
-		<mem start="0x0" end="0x9a000"/>
-		<mem start="0x100000" end="0xfffff000"/>
-		<!--<ioio/>-->
-		<nullio io_base="0x80" />
-		<pic io_base="0x20" elcr_base="0x4d0"/>
-		<pic io_base="0xa0" irq="2" elcr_base="0x4d1"/>
-		<pit io_base="0x40" irq="0"/>
-		<scp io_port_a="0x92" io_port_b="0x61"/>
-		<kbc io_base="0x60" irq_kbd="1" irq_aux="12"/>
-		<keyb ps2_port="0" host_keyboard="0x10000"/>
-		<mouse ps2_port="1" host_mouse="0x10001"/>
-		<rtc io_base="0x70" irq="8"/>
-		<serial io_base="0x3f8" irq="0x4" host_serial="0x4711"/>
-		<hostsink host_dev="0x4712" buffer="80"/>
-		<vga io_base="0x03c0"/>
-
-		<vbios_disk/>
-		<vbios_keyboard host_keyboard="0x10000"/>
-		<vbios_mem/>
-		<vbios_time/>
-		<vbios_reset/>
-
-		<msi/>
-		<ioapic/>
-		<pcihostbridge bus_num="0" bus_count="0x10" io_base="0xcf8"
-		               mem_base="0xe0000000"/>
-		<pmtimer io_port="0x8000"/>
-
-		<vcpu/> <halifax/> <vbios/> <lapic/>
-
-		<ahci mem="0xe0800000" irq="14" bdf="0x30"/>
-		<drive sigma0drive="0" controller="0" port="0"/>
-		<rtl8029 irq="9" port="0x300"/>
-	</machine>
-	<multiboot/>
-</config>