Add Alpine and Seoul testing packages

This commit is contained in:
Emery Hemingway 2019-05-14 10:15:46 +02:00
parent b2defa40dc
commit 739d009b6d
10 changed files with 461 additions and 0 deletions

View File

@ -0,0 +1,16 @@
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) \
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)

View File

@ -0,0 +1,16 @@
TARGET_NAME = alpine_seoul_nova_installer
include_rules
PKG_DEPENDS += \
@(PUBLIC_SRC_BASE_NOVA) \
@(PUBLIC_SRC_INIT) \
@(PUBLIC_SRC_ROM_BLOCK) \
local/src/seoul-nova \
_/raw/alpine-standard-x86 \
IMAGE_NAME = alpine-standard-$(ALPINE_VERSION)-x86.iso
: ../../../seoul_installer_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)

View File

@ -0,0 +1,87 @@
<runtime ram="1380M" caps="2200" binary="init">
<requires>
<file_system/>
<nic/>
<rom label="platform_info"/>
<nitpicker/>
<rm/>
<rtc/>
</requires>
<content>
<rom label="fs_block"/>
<rom label="init"/>
<rom label="nit_fb"/>
<rom label="seoul"/>
<rom label="timer"/>
<rom label="vm_seoul.cfg"/>
</content>
<config verbose="yes" prio_levels="2">
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="File_system"/>
<service name="Nitpicker"/>
<service name="Rtc"/>
<service name="Nic"/>
</parent-provides>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
<config/>
<route>
<service name="ROM" label="platform_info">
<parent label="platform_info"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="nit_fb" priority="0">
<resource name="RAM" quantum="8M" />
<provides>
<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>
</start>
<start name="seoul" priority="-1" caps="200" ld="no">
<binary name="seoul"/>
<resource name="RAM" quantum="1024M"/>
<route>
<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"/>
</start>
</config>
</runtime>

View File

@ -0,0 +1,38 @@
<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>

View File

@ -0,0 +1,3 @@
RELEASE_TYPE = virt
RELEASE_ARCH = x86
include ../iso_rom_rules.tup

View File

@ -0,0 +1,18 @@
TARGET_NAME = openbsd_seoul_nova_installer
IMAGE_TYPE = miniroot
IMAGE_NAME = $(IMAGE_TYPE)65.fs
include_rules
PKG_DEPENDS += \
@(PUBLIC_SRC_BASE_NOVA) \
@(PUBLIC_SRC_INIT) \
@(PUBLIC_SRC_ROM_BLOCK) \
@(PUBLIC_SRC_SEOUL_NOVA) \
_/raw/openbsd-miniroot-i386 \
: ../seoul_installer_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)

View File

@ -0,0 +1,17 @@
TARGET_NAME = seoul_alpine_test
IMAGE_NAME = alpine-virt-3.9.3-x86.iso
include_rules
PKG_DEPENDS += \
@(PUBLIC_SRC_BASE_NOVA) \
@(PUBLIC_SRC_INIT) \
@(PUBLIC_SRC_ROM_BLOCK) \
@(PUBLIC_SRC_TERMINAL) \
_/raw/alpine-virt-x86 \
_/src/seoul-nova \
: ../seoul_test_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)

View File

@ -0,0 +1,115 @@
<runtime ram="1380M" caps="2200" binary="init">
<requires>
<block label="target"/>
<nic/>
<nitpicker/>
<rm/>
<rom label="platform_info"/>
<rtc/>
</requires>
<content>
<rom label="@IMAGE_NAME@"/>
<rom label="init"/>
<rom label="rom_block"/>
<rom label="seoul"/>
<rom label="timer"/>
</content>
<config verbose="yes" prio_levels="2">
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Block"/>
<service name="File_system"/>
<service name="Nitpicker"/>
<service name="Rtc"/>
<service name="Nic"/>
</parent-provides>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
<config/>
<route>
<service name="ROM" label="platform_info">
<parent label="platform_info"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="rom_block" priority="-1">
<resource name="RAM" quantum="2M" />
<provides><service name="Block"/></provides>
<config file="@IMAGE_NAME@" block_size="512"/>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="seoul" priority="-1" caps="200" ld="no">
<binary name="seoul"/>
<resource name="RAM" quantum="4G"/>
<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/>
<vcpu/> <halifax/> <vbios/> <lapic/>
<ahci mem="0xe0800000" irq="14" bdf="0x30"/>
<drive sigma0drive="0" controller="0" port="0"/>
<drive sigma0drive="1" controller="0" port="1"/>
<rtl8029 irq="9" port="0x300"/>
</machine>
<multiboot/>
</config>
<route>
<service name="ROM" label="platform_info">
<parent label="platform_info"/> </service>
<service name="Block" label_suffix="0">
<child name="rom_block"/></service>
<service name="Block" label_suffix="1">
<parent label="target"/></service>
<any-service>
<any-child/>
<parent/>
</any-service>
</route>
</start>
</config>
</runtime>

View File

@ -0,0 +1,19 @@
TARGET_NAME = seoul_openbsd_test
IMAGE_TYPE = miniroot
include ../openbsd/version.tup
IMAGE_NAME = $(IMAGE_TYPE)$(VERSION).fs
include_rules
PKG_DEPENDS += \
@(PUBLIC_SRC_BASE_NOVA) \
@(PUBLIC_SRC_INIT) \
@(PUBLIC_SRC_ROM_BLOCK) \
@(PUBLIC_SRC_TERMINAL) \
_/raw/openbsd-$(IMAGE_TYPE)-i386 \
_/src/seoul-nova
: ../seoul_test_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)

132
vm/seoul_test_runtime.in Normal file
View File

@ -0,0 +1,132 @@
<runtime ram="256M" caps="2200" binary="init">
<requires>
<block/>
<file_system label="fonts"/>
<nic/>
<nitpicker/>
<rm/>
<rom label="platform_info"/>
<rtc/>
</requires>
<content>
<rom label="@IMAGE_NAME@"/>
<rom label="init"/>
<rom label="rom_block"/>
<rom label="seoul"/>
<rom label="timer"/>
<rom label="terminal"/>
</content>
<config verbose="yes" prio_levels="2">
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Block"/>
<service name="File_system"/>
<service name="Nitpicker"/>
<service name="Rtc"/>
<service name="Nic"/>
</parent-provides>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
<config/>
<route>
<service name="ROM" label="platform_info">
<parent label="platform_info"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="rom_block" priority="-1">
<resource name="RAM" quantum="2M" />
<provides><service name="Block"/></provides>
<config file="@IMAGE_NAME@" block_size="512"/>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="terminal">
<resource name="RAM" quantum="8M"/>
<provides> <service name="Terminal"/> </provides>
<config>
<vfs> <dir name="fonts"> <fs label="fonts"/> </dir> </vfs>
</config>
<route>
<service name="File_system"> <parent label="fonts"/> </service>
<any-service> <any-child/> <parent/> </any-service>
</route>
</start>
<start name="seoul" priority="-1" caps="200" ld="no">
<binary name="seoul"/>
<resource name="RAM" quantum="4G"/>
<config colocate="1" width="720" height="400">
<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"/>
<terminal host_dev="0x4712"/>
<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/>
<vcpu/> <halifax/> <vbios/> <lapic/>
<ahci mem="0xe0800000" irq="14" bdf="0x30"/>
<drive sigma0drive="0" controller="0" port="0"/>
<drive sigma0drive="1" controller="0" port="1"/>
<!-- <rtl8029 irq="9" port="0x300" /> -->
<virtio_net/>
<virtio_block/>
</machine>
<multiboot/>
</config>
<route>
<service name="ROM" label="platform_info">
<parent label="platform_info"/> </service>
<service name="Block" label_suffix="0">
<child name="rom_block"/></service>
<service name="Block" label_suffix="1">
<parent/></service>
<any-service>
<any-child/>
<parent/>
</any-service>
</route>
</start>
</config>
</runtime>