New stuff

2019-04-07 17:27:05 +02:00 · 2019-04-07 17:27:05 +02:00 · 8ea2f9cf48
parent 578213c0d5
commit 8ea2f9cf48
13 changed files with 265 additions and 8 deletions
--- a/build-x86_64/tup.config
+++ b/build-x86_64/tup.config
@ -15,6 +15,7 @@ CONFIG_PUBLIC_SRC_BASE_NOVA=genodelabs/src/base-nova/2019-03-17
 CONFIG_PUBLIC_SRC_BLOCK_SHRED=ehmry/src/block_shred/2019-03-31
 CONFIG_PUBLIC_SRC_CHROOT=genodelabs/src/chroot/2019-03-17
 CONFIG_PUBLIC_SRC_EXPAT=nfeske/src/expat/2019-02-19
+CONFIG_PUBLIC_SRC_FS_LOG=ehmry/src/fs_log/2019-04-01
 CONFIG_PUBLIC_SRC_INIT=genodelabs/src/init/2019-03-17
 CONFIG_PUBLIC_SRC_LIBC=genodelabs/src/libc/2019-03-17
 CONFIG_PUBLIC_SRC_LIBCRYPTO=genodelabs/src/libcrypto/2019-03-17
@ -22,21 +23,22 @@ CONFIG_PUBLIC_SRC_LIBICONV=genodelabs/src/libiconv/2019-02-25
 CONFIG_PUBLIC_SRC_LIBPNG=genodelabs/src/libpng/2019-02-25
 CONFIG_PUBLIC_SRC_LIBSSH=genodelabs/src/libssh/2019-03-17
 CONFIG_PUBLIC_SRC_LIBSSL=genodelabs/src/libssl/2019-03-17
-CONFIG_PUBLIC_SRC_LWIP=ehmry/src/vfs_lwip/2019-04-01
 CONFIG_PUBLIC_SRC_MENU_VIEW=genodelabs/src/menu_view/2019-03-17
 CONFIG_PUBLIC_SRC_MESA=nfeske/src/mesa/2019-02-19
 CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-03-17
 CONFIG_PUBLIC_SRC_NIT_FB=genodelabs/src/nit_fb/2019-03-17
 CONFIG_PUBLIC_SRC_POSIX=genodelabs/src/posix/2019-03-17
 CONFIG_PUBLIC_SRC_RAM_BLOCK=alex-ab/src/ram_block/2019-02-25
-CONFIG_PUBLIC_SRC_ROM_BLOCK=ehmry/src/rom_block/2019-04-05-a
 CONFIG_PUBLIC_SRC_REPORT_ROM=genodelabs/src/report_rom/2019-03-17
+CONFIG_PUBLIC_SRC_ROM_BLOCK=ehmry/src/rom_block/2019-04-05-a
 CONFIG_PUBLIC_SRC_SEOUL_NOVA=alex-ab/src/seoul-nova/2019-04-05
+CONFIG_PUBLIC_SRC_SHOW_INPUT=ehmry/src/show_input/2019-04-07
 CONFIG_PUBLIC_SRC_SSH_CLIENT=ehmry/src/ssh_client/2019-03-29
 CONFIG_PUBLIC_SRC_STDCXX=genodelabs/src/stdcxx/2019-02-25
 CONFIG_PUBLIC_SRC_TERMINAL=ehmry/src/terminal/2019-04-05
 CONFIG_PUBLIC_SRC_VBOX_NOVA=genodelabs/src/vbox5-nova/2019-03-17
 CONFIG_PUBLIC_SRC_VFS=genodelabs/src/vfs/2019-03-18
 CONFIG_PUBLIC_SRC_VFS_JITTERENTROPY=ehmry/src/vfs_jitterentropy/2019-03-17
+CONFIG_PUBLIC_SRC_VFS_LWIP=ehmry/src/vfs_lwip/2019-04-01
 CONFIG_PUBLIC_SRC_VFS_TTF=ehmry/src/vfs_ttf/2019-03-17
 CONFIG_PUBLIC_SRC_ZLIB=genodelabs/src/zlib/2019-02-25
--- a/index.xml
+++ b/index.xml
@ -27,10 +27,15 @@
 	</index>

 	<index name="VMs">
+		<index name="NixOS">
+			<pkg path="_/pkg/fetch-nixos" info="Download a NixOS ISO"/>
+		</index>
 		<!-- <pkg path="_/pkg/fetch_alpine_x86_virt" info="Download an Alpine ISO"/> -->
 		<!-- <pkg path="_/pkg/dual_nic_vbox" info="32bit VirtualBox as a Nic service"/> -->
-		<pkg path="_/pkg/installer-alpine_seoul_nova" info="Alpine Linux as a Seoul VMM guest installer with 8GiB disk"/>
-		<pkg path="_/pkg/alpine_seoul_nova" info="Alpine Linux as a Seoul VMM guest with 8GiB disk"/>
+		<index name="Alpine">
+			<pkg path="_/pkg/installer-alpine_seoul_nova" info="Alpine Linux as a Seoul VMM guest installer with 8GiB disk"/>
+			<pkg path="_/pkg/alpine_seoul_nova" info="Alpine Linux as a Seoul VMM guest with 8GiB disk"/>
+		</index>
 	</index>

 	<index name="Operating system demos">
@ -51,6 +56,14 @@
 		<pkg path="_/pkg/ninep" info="9P server"/>
 	</index>

+<!--
+	<index name="Network">
+		<pkg path="_/pkg/nic_bridge" info="Ethernet bridge service"/>
+		<pkg path="_/pkg/nic_bridge_logged" info="Logged ethernet bridge service"/>
+		<pkg path="_/pkg/ssh_client" info="SSH client"/>	
+	</index>
+ -->
+
 	<index name="Experimental">
 		<pkg path="_/pkg/4do"/>
 		<pkg path="_/pkg/advanced_tests"/>
--- a/runtimes/alpine/alpine_seoul_nova/runtime
+++ b/runtimes/alpine/alpine_seoul_nova/runtime
@ -61,7 +61,7 @@
 			<resource name="RAM" quantum="8M" />
 			<provides><service name="Block"/></provides>
 			<config>
-				 <default-policy file="alpine.disk" block_size="512" device_size="8G" writeable="yes"/>
+				 <default-policy file="alpine.disk" block_size="512" writeable="yes"/>
 			</config>
 			<route>
 				<any-service> <parent/> </any-service>
--- a/runtimes/chroot/Tupfile
+++ b/runtimes/chroot/Tupfile
@ -0,0 +1,4 @@
+TARGET_NAME = chroot
+include_rules
+PKG_DEPENDS += @(PUBLIC_SRC_CHROOT)
+: runtime |> !collect_pkg_runtime |>
--- a/runtimes/chroot/runtime
+++ b/runtimes/chroot/runtime
@ -0,0 +1,6 @@
+<runtime ram="1M" caps="96" binary="chroot">
+	<requires> <file_system/> </requires>
+	<provides> <file_system/> </provides>
+	<content> <rom label="chroot"/> </content>
+	<config> <default-policy writeable="yes"/> </config>
+</runtime>
--- a/runtimes/depot_9P/Tupfile
+++ b/runtimes/depot_9P/Tupfile
@ -3,7 +3,7 @@ TARGET_NAME = depot_9P
 PKG_DEPENDS += \
 	@(SDK_USER)/src/libc/@(SDK_VERSION) \
 	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
-	@(PUBLIC_SRC_LWIP) \
+	@(PUBLIC_SRC_VFS_LWIP) \
 	_/src/ninep \

 include_rules
--- a/runtimes/fetchers/fetch-nixos/Tupfile
+++ b/runtimes/fetchers/fetch-nixos/Tupfile
@ -0,0 +1,32 @@
+TARGET_NAME = fetch_nixos
+
+PKG_DEPENDS += \
+	@(SDK_USER)/src/init/@(SDK_VERSION) \
+	@(SDK_USER)/src/libc/@(SDK_VERSION) \
+	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
+	@(PUBLIC_SRC_INIT) \
+	@(PUBLIC_SRC_LIBPNG) \
+	@(PUBLIC_SRC_LIBSSL) \
+	@(PUBLIC_SRC_LIBCRYPTO) \
+	@(PUBLIC_SRC_MENU_VIEW) \
+	@(PUBLIC_SRC_REPORT_ROM) \
+	@(PUBLIC_SRC_VFS_LWIP) \
+	@(PUBLIC_SRC_ZLIB) \
+	_/raw/$(TARGET_NAME) \
+	_/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^ \
+	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}
--- a/runtimes/fetchers/fetch-nixos/machine.vbox
+++ b/runtimes/fetchers/fetch-nixos/machine.vbox
@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<VirtualBox xmlns="http://www.virtualbox.org/" version="1.14-freebsd">
+  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_16_04_64" OSType="Ubuntu_64" snapshotFolder="Snapshots" lastStateChange="2018-01-23T18:40:00Z">
+    <MediaRegistry>
+      <HardDisks>
+        <HardDisk uuid="{a90a16bf-f724-4321-99df-5498d6e4b796}" location="machine.vdi" format="VDI" type="Normal"/>
+      </HardDisks>
+      <DVDImages>
+        <Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}" location="installer.iso"/>
+      </DVDImages>
+    </MediaRegistry>
+    <Hardware>
+      <CPU count="2">
+        <PAE enabled="true"/>
+        <LongMode enabled="true"/>
+        <HardwareVirtExLargePages enabled="false"/>
+      </CPU>
+      <Memory RAMSize="1536"/>
+      <HID Pointing="USBTablet"/>
+      <Display VRAMSize="20"/>
+      <RemoteDisplay enabled="false"/>
+      <BIOS>
+        <IOAPIC enabled="true"/>
+      </BIOS>
+      <USB>
+        <Controllers>
+          <Controller name="OHCI" type="OHCI"/>
+        </Controllers>
+      </USB>
+      <Network>
+        <Adapter slot="0" enabled="true" MACAddress="0800271D7901" cable="true" type="82540EM">
+          <BridgedInterface/>
+        </Adapter>
+      </Network>
+      <UART>
+        <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
+        <Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
+      </UART>
+      <LPT>
+        <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
+        <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
+      </LPT>
+      <AudioAdapter controller="HDA" driver="OSS" enabled="false"/>
+      <RTC localOrUTC="UTC"/>
+      <SharedFolders>
+        <SharedFolder name="shared" hostPath="/shared" writable="true" autoMount="true"/>
+      </SharedFolders>
+    </Hardware>
+    <StorageControllers>
+      <StorageController name="SATA" type="AHCI" PortCount="4" useHostIOCache="true" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3">
+        <AttachedDevice type="HardDisk" port="0" device="0">
+          <Image uuid="{a90a16bf-f724-4321-99df-5498d6e4b796}"/>
+        </AttachedDevice>
+        <AttachedDevice passthrough="false" type="DVD" port="3" device="0">
+          <Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}"/>
+        </AttachedDevice>
+      </StorageController>
+    </StorageControllers>
+  </Machine>
+</VirtualBox>
--- a/runtimes/fetchers/machine.vdi
+++ b/runtimes/fetchers/machine.vdi
--- a/runtimes/fetchers/runtime.in
+++ b/runtimes/fetchers/runtime.in
@ -0,0 +1,109 @@
+<runtime ram="24M" caps="768" binary="init">
+
+	<requires>
+		<file_system label="fonts"/>
+		<file_system label="target"/>
+		<nic/>
+		<nitpicker/>
+	</requires>
+
+	<content>
+		<rom label="fetch_and_copy"/>
+		<rom label="init"/>
+		<rom label="libc.lib.so"/>
+		<rom label="libcrypto.lib.so"/>
+		<rom label="libm.lib.so"/>
+		<rom label="libpng.lib.so"/>
+		<rom label="libssl.lib.so"/>
+		<rom label="machine.vdi"/>
+		<rom label="menu_view"/>
+		<rom label="menu_view_styles.tar"/>
+		<rom label="machine.vbox"/>
+		<rom label="report_rom"/>
+		<rom label="vfs.lib.so"/>
+		<rom label="vfs_lwip.lib.so"/>
+		<rom label="zlib.lib.so"/>
+	</content>
+
+	<config>
+		<parent-provides>
+			<service name="ROM"/>
+			<service name="PD"/>
+			<service name="RM"/>
+			<service name="CPU"/>
+			<service name="LOG"/>
+			<service name="Timer"/>
+			<service name="File_system"/>
+			<service name="Nitpicker"/>
+			<service name="Nic"/>
+		</parent-provides>
+	
+		<default-route>
+			<any-service> <parent/> </any-service>
+		</default-route>
+	
+		<default caps="128"/>
+
+		<start name="report_rom">
+			<resource name="RAM" quantum="1M"/>
+			<provides>
+				<service name="Report"/>
+				<service name="ROM"/>
+			</provides>
+			<config>
+				<policy label="dialog" report="dialog"/>
+			</config>
+		</start>
+	
+		<start name="menu_view" caps="256">
+			<resource name="RAM" quantum="8M"/>
+			<config>
+				<libc stderr="/dev/log"/>
+				<vfs>
+					<tar name="menu_view_styles.tar" />
+					<dir name="dev"> <log/> </dir>
+					<dir name="fonts"> <fs label="fonts"/> </dir>
+				</vfs>
+			</config>
+			<route>
+				<service name="File_system" label="fonts">
+					<parent label="fonts"/> </service>
+				<service name="ROM" label="dialog">
+					<child name="report_rom" label="dialog"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+	
+		<start name="fetch_and_copy" caps="256">
+			<resource name="RAM" quantum="16M"/>
+			<config>
+				<libc stdout="/dev/log" stderr="/dev/log" socket="/socket" rtc="/dev/rtc"/>
+				<vfs>
+					<dir name="dev">
+						<inline name="rtc">2018-01-01 00:01</inline>
+						<log/> <zero name="random"/>
+					</dir>
+					<dir name="socket"> <lwip dhcp="yes"/> </dir>
+					<dir name="target"> <fs label="target"/> </dir>
+					<dir name="rom">
+						<rom name="machine.vbox"/>
+						<rom name="machine.vdi"/>
+					</dir>
+				</vfs>
+				<fetch url="@URL@"
+				       path="/target/installer.iso"
+				       sha256="@SHA256@"/>
+				<copy from="/rom/machine.vbox"  to="/target/machine.vbox"/>
+				<copy from="/rom/machine.vdi" to="/target/machine.vdi"/>
+			</config>
+			<route>
+				<service name="File_system" label="target">
+					<parent label="target"/> </service>
+				<service name="Report" label="dialog">
+					<child name="report_rom" label="dialog"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+	</config>
+
+</runtime>
--- a/runtimes/show_input/Tupfile
+++ b/runtimes/show_input/Tupfile
@ -0,0 +1,9 @@
+TARGET_NAME = show_input
+
+PKG_DEPENDS += \
+	@(PUBLIC_SRC_SHOW_INPUT) \
+
+include_rules
+
+: runtime |> !collect_pkg_runtime |>
+: |> !pkg |>
--- a/runtimes/show_input/runtime
+++ b/runtimes/show_input/runtime
@ -0,0 +1,23 @@
+<runtime ram="12M" caps="256" binary="show_input">
+
+	<requires>
+		<file_system label="fonts"/>
+		<nitpicker/>
+	</requires>
+
+	<content>
+		<rom label="libc.lib.so"/>
+		<rom label="libm.lib.so"/>
+		<rom label="show_input"/>
+		<rom label="vfs.lib.so"/>
+	</content>
+
+	<config>
+		<vfs>
+			<dir name="fonts">
+				<fs label="fonts"/>
+			</dir>
+		</vfs>
+	</config>
+
+</runtime>
--- a/runtimes/ssh_client/Tupfile
+++ b/runtimes/ssh_client/Tupfile
@ -6,8 +6,7 @@ PKG_DEPENDS += \
 	@(PUBLIC_SRC_INIT) \
 	@(PUBLIC_SRC_LIBCRYPTO) \
 	@(PUBLIC_SRC_LIBSSH) \
-	@(PUBLIC_SRC_LWIP) \
-	@(PUBLIC_SRC_LWIP) \
+	@(PUBLIC_SRC_VFS_LWIP) \
 	@(PUBLIC_SRC_SSH_CLIENT) \
 	@(PUBLIC_SRC_TERMINAL) \
 	@(PUBLIC_SRC_VFS_JITTERENTROPY) \