19.05 updates

.gitignore

@@ -0,0 +1,3 @@
+/toolchain-*
+/sdk-*
+.tup

.gitmodules

@@ -1,27 +1,27 @@
 [submodule "submodules/musicbrainz_playlist_generator"]
 	path = nim/musicbrainz_playlist_generator
-	url = git@github.com:ehmry/musicbrainz_playlist_generator.git
+	url = git://depot.h4ck.me/srv/git/musicbrainz_playlist_generator
 [submodule "nimble/icy_client"]
 	path = nim/icy_client
-	url = git@github.com:ehmry/icy_client.git
+	url = git://depot.h4ck.me/srv/git/icy_client
 [submodule "nim-genode"]
 	path = nim/nim-genode
-	url = git@github.com:ehmry/nim-genode.git
+	url = git://depot.h4ck.me/srv/git/nim-genode
 [submodule "nimble/imap_report"]
 	path = nim/imap_report
 	url = git@github.com:ehmry/imap_report.git
 [submodule "nimble/blobsets"]
 	path = nim/blobsets
-	url = git@github.com:ehmry/blobsets.git
+	url = git://depot.h4ck.me/srv/git/blobsets
 [submodule "nimble/ninep"]
 	path = nim/ninep
-	url = git@github.com:ehmry/ninep.git
+	url = git://depot.h4ck.me/srv/git/ehmry/ninep
 [submodule "libretro/libretro-common"]
 	path = libretro/libretro-common
 	url = https://github.com/libretro/libretro-common.git
 [submodule "libretro/retro_frontend"]
 	path = libretro/retro_frontend
-	url = git@github.com:ehmry/genode-libretro.git
+	url = git://depot.h4ck.me/srv/git/retro_frontend
 [submodule "libretro/cores/2048/core"]
 	path = libretro/cores/2048/upstream
 	url = https://github.com/libretro/libretro-2048
@@ -36,7 +36,7 @@
 	url = https://github.com/libretro/mgba
 [submodule "libretro/cores/nxengine/core"]
 	path = libretro/cores/nxengine/upstream
-	url = https://github.com/libretro/nxengine-libretro
+	url = git://depot.h4ck.me/srv/git/nxengine
 [submodule "libretro/cores/oberon/core"]
 	path = libretro/cores/oberon/upstream
 	url = https://github.com/pdewacht/oberon-risc-emu.git
@@ -63,7 +63,7 @@
 	url = https://github.com/libretro/Dinothawr
 [submodule "nimble/nim-monero"]
 	path = nim/nim-monero
-	url = git@git.fuzzlabs.org:emery/nim-monero.git
+	url = git://depot.h4ck.me/srv/git/nim-monero
 [submodule "libretro/cores/scummvm/upstream"]
 	path = libretro/cores/scummvm/upstream
 	url = https://github.com/libretro/scummvm.git
@@ -84,7 +84,7 @@
 	url = git@github.com:ehmry/spry_genode.git
 [submodule "nimble/carn"]
 	path = nim/carn_layouter
-	url = git@github.com:ehmry/fibonacci.git
+	url = git://depot.h4ck.me/srv/git/carn_layouter
 [submodule "libretro/bios/cbios-cbios"]
 	path = libretro/bios/cbios-cbios
 	url = https://git.code.sf.net/p/cbios/cbios
@@ -96,4 +96,4 @@
 	url = https://github.com/fr500/dosbox-svn
 [submodule "nim/xspf_view"]
 	path = nim/xspf_view
-	url = https://github.com/ehmry/xspf_view.git
+	url = git://depot.h4ck.me/srv/git/xspf_view

Tuprules.tup

@@ -99,14 +99,13 @@ SDK_INCLUDE = $(TUP_CWD)/sdk.tup
 
 ERRATA_DIR = $(TUP_CWD)/errata
 
-CC  = @(CC_WRAPPER) `pkg-config genode-base --variable cc`
-CXX = @(CXX_WRAPPER) `pkg-config genode-base --variable cxx`
-LD  = `pkg-config genode-base --variable ld`
-AR  = `pkg-config genode-base --variable ar`
+PKG_CONFIG = PKG_CONFIG_PATH=@(PKG_CONFIG_PATH) pkg-config
+
+CC  = @(CC_WRAPPER) `$(PKG_CONFIG) genode-base --variable cc`
+CXX = @(CXX_WRAPPER) `$(PKG_CONFIG) genode-base --variable cxx`
+LD  = `$(PKG_CONFIG) genode-base --variable ld`
+AR  = `$(PKG_CONFIG) genode-base --variable ar`
 
 !cc = |> ^ CC %f^ $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) -c %f -o %o |>
 !cxx = |> ^ CC %f^ $(CC) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) -c %f -o %o |>
 !ld = |> ^ LD %o^ $(LD) $(LDFLAGS) %f -o %o |>
-
-export PKG_CONFIG_PATH
-PKG_CONFIG = PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(SDK_DIR)/pkgconfig pkg-config

build-x86_64/tup.config

@@ -1,59 +1,62 @@
 CONFIG_TUP_ARCH=x86_64
 
+CONFIG_SCULPT_VERSION=19.05
+CONFIG_PKG_CONFIG_PATH=/opt/genode/sdk-19.05/pkgconfig/x86_64
+CONFIG_TOOLCHAIN_PATH=/opt/genode/toolchain-19.05/bin
+
 CONFIG_CC_WRAPPER=ccache
 CONFIG_CXX_WRAPPER=ccache
 
-CONFIG_SCULPT_VERSION=19.02
-CONFIG_SDK_USER=ehmry
-CONFIG_SDK_VERSION=19.02
-CONFIG_UPSTREAM_USER=ehmry
-CONFIG_UPSTREAM_VERSION=19.02
-
 #CONFIG_NO_NETWORK=
+CONFIG_SKIP_INCOMPATIBLE=
 
 CONFIG_PUBLIC_USER=ehmry
 CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7
 
 CONFIG_PUBLIC_PKG_AUDIO_PLAYER=ehmry/pkg/audio_player/2019-05-15
 CONFIG_PUBLIC_PKG_AVPLAY=ehmry/pkg/avplay/2019-04-24
+CONFIG_PUBLIC_PKG_BACKDROP=ehmry/pkg/backdrop/2019-05-24
+CONFIG_PUBLIC_PKG_NOUX_SYSTEM=ehmry/pkg/noux-system/2019-05-24
 CONFIG_PUBLIC_PKG_PDF_VIEW=ehmry/pkg/pdf_view/2019-05-17
 
 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_CHROOT=ehmry/src/chroot/2019-05-24
 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
+CONFIG_PUBLIC_SRC_INIT=ehmry/src/init/2019-05-24
+CONFIG_PUBLIC_SRC_LIBC=ehmry/src/libc/2019-05-24
+CONFIG_PUBLIC_SRC_LIBCRYPTO=ehmry/src/libcrypto/2019-05-24
 CONFIG_PUBLIC_SRC_LIBICONV=genodelabs/src/libiconv/2019-02-25
-CONFIG_PUBLIC_SRC_LIBMPG123=ehmry/src/libmpg123/19.02
-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_MENU_VIEW=genodelabs/src/menu_view/2019-03-17
-CONFIG_PUBLIC_SRC_MESA=nfeske/src/mesa/2019-02-19
-CONFIG_PUBLIC_SRC_MOTIF_DECORATOR=genodelabs/src/decorator/2019-03-17
-CONFIG_PUBLIC_SRC_MP3_AUDIO_SINK=ehmry/src/mp3_audio_sink/19.02
-CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-04-12
-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_LIBMPG123=ehmry/src/libmpg123/2019-05-24
+CONFIG_PUBLIC_SRC_LIBPNG=ehmry/src/libpng/2019-05-24
+CONFIG_PUBLIC_SRC_LIBSSH=ehmry/src/libssh/2019-05-24
+CONFIG_PUBLIC_SRC_LIBSSL=ehmry/src/libssl/2019-05-24
+CONFIG_PUBLIC_SRC_MENU_VIEW=ehmry/src/menu_view/2019-05-24
+CONFIG_PUBLIC_SRC_MESA=ehmry/src/mesa/2019-05-24
+CONFIG_PUBLIC_SRC_MOTIF_DECORATOR=ehmry/src/decorator/2019-05-24
+CONFIG_PUBLIC_SRC_MP3_AUDIO_SINK=ehmry/src/mp3_audio_sink/2019-05-24
+CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-05-24
+CONFIG_PUBLIC_SRC_NIT_FB=ehmry/src/nit_fb/2019-05-24
+CONFIG_PUBLIC_SRC_NOUX=ehmry/src/noux/2019-05-24
+CONFIG_PUBLIC_SRC_NCURSES=ehmry/src/ncurses/2019-05-24
+CONFIG_PUBLIC_SRC_POSIX=ehmry/src/posix/2019-05-24
 CONFIG_PUBLIC_SRC_RAM_BLOCK=alex-ab/src/ram_block/2019-02-25
-CONFIG_PUBLIC_SRC_REPORT_ROM=genodelabs/src/report_rom/2019-03-17
+CONFIG_PUBLIC_SRC_REPORT_ROM=ehmry/src/report_rom/2019-05-24
 CONFIG_PUBLIC_SRC_ROM_BLOCK=ehmry/src/rom_block/2019-04-05-a
-CONFIG_PUBLIC_SRC_SDL=ehmry/src/sdl/19.02
+CONFIG_PUBLIC_SRC_SDL=ehmry/src/sdl/2019-05-24
 CONFIG_PUBLIC_SRC_SEOUL_NOVA=ehmry/src/seoul-nova/2019-05-01-a
-CONFIG_PUBLIC_SRC_SHOW_INPUT=ehmry/src/show_input/2019-04-07
-CONFIG_PUBLIC_SRC_SSH_CLIENT=ehmry/src/ssh_client/2019-04-08
-CONFIG_PUBLIC_SRC_STDCXX=genodelabs/src/stdcxx/2019-02-25
-CONFIG_PUBLIC_SRC_TERMINAL=ehmry/src/terminal/2019-04-05
+CONFIG_PUBLIC_SRC_SHOW_INPUT=ehmry/src/show_input/2019-05-24
+CONFIG_PUBLIC_SRC_SSH_CLIENT=ehmry/src/ssh_client/2019-05-24
+CONFIG_PUBLIC_SRC_STDCXX=ehmry/src/stdcxx/2019-05-24
+CONFIG_PUBLIC_SRC_TERMINAL=ehmry/src/terminal/2019-05-24-a
 CONFIG_PUBLIC_SRC_VBOX_NOVA=genodelabs/src/vbox5-nova/2019-03-17
 CONFIG_PUBLIC_SRC_VFS_AUDIT=ehmry/src/vfs_audit/2019-04-20
-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_LXIP=cproc/src/vfs_lxip/2019-03-18
-CONFIG_PUBLIC_SRC_VFS_TTF=ehmry/src/vfs_ttf/2019-03-17
-CONFIG_PUBLIC_SRC_WINDOW_LAYOUTER=genodelabs/src/window_layouter/2019-03-17
-CONFIG_PUBLIC_SRC_WM=genodelabs/src/wm/2019-03-17
-CONFIG_PUBLIC_SRC_ZLIB=genodelabs/src/zlib/2019-02-25
+CONFIG_PUBLIC_SRC_VFS=ehmry/src/vfs/2019-05-24
+CONFIG_PUBLIC_SRC_VFS_JITTERENTROPY=ehmry/src/vfs_jitterentropy/2019-05-24
+CONFIG_PUBLIC_SRC_VFS_LWIP=ehmry/src/vfs_lwip/2019-05-24
+CONFIG_PUBLIC_SRC_VFS_LXIP=ehmry/src/vfs_lxip/2019-05-24
+CONFIG_PUBLIC_SRC_VFS_TTF=ehmry/src/vfs_ttf/2019-05-24
+CONFIG_PUBLIC_SRC_WINDOW_LAYOUTER=ehmry/src/window_layouter/2019-05-24
+CONFIG_PUBLIC_SRC_WM=ehmry/src/wm/2019-05-24
+CONFIG_PUBLIC_SRC_ZLIB=ehmry/src/zlib/2019-05-24

index.xml

@@ -19,7 +19,7 @@
 
 	<index name="Games">
 		<pkg path="_/pkg/2048" info="Threes! clone"/>
-		<pkg path="ehmry/pkg/abuse/2019-03-20" info="Side-scrolling shooter"/>
+		<pkg path="ehmry/pkg/abuse/2019-05-24" info="Side-scrolling shooter"/>
 		<pkg path="_/pkg/cave_story-en" info="Cave Story ~ Doukutsu Monogatari is a jumping-and-shooting action game."/>
 		<pkg path="_/pkg/mrboom" info="Bomberman clone"/>
 		<pkg path="_/pkg/quake_dopa" info="Quake Episode 5: Dimension of the Past (id1/pak1.pak required)"/>
@@ -28,12 +28,12 @@
 	</index>
 
 	<index name="Block devices">
-		<pkg path="_/pkg/alpine-standard-x86" info="Alpine live ISO service"/>
-		<pkg path="_/pkg/alpine-virt-x86_64" info="Alpine live ISO service"/>
+		<!-- <pkg path="_/pkg/alpine-standard-x86" info="Alpine live ISO service"/> -->
+		<!-- <pkg path="_/pkg/alpine-virt-x86_64" info="Alpine live ISO service"/> -->
 		<pkg path="_/pkg/dummy_block" info="Dummy block device"/>
 		<pkg path="_/pkg/fs_block_4G" info="File-system backed 4GiB block device"/>
 		<pkg path="_/pkg/fs_block_8G" info="File-system backed 8GiB block device"/>
-		<pkg path="_/pkg/ReactOS-live" info="ReactOS live ISO service"/>
+		<!-- <pkg path="_/pkg/ReactOS-live" info="ReactOS live ISO service"/> -->
 	</index>
 
 	<index name="VMMs">
@@ -60,11 +60,16 @@
 	</index>
 
 	<index name="Utility">
+		<index name="Audio">
+			<pkg path="ehmry/pkg/bsd_audio_drv/2019-05-24" info="Cnuke's audio driver"/>
+			<pkg path="ehmry/pkg/audio_player/2019-05-24" info="Cnuke's audio player"/>
+		</index>
+
 		<index name="Graphic">
 			<!-- <pkg path="ehmry/pkg/flif_capture/2019-03-22" info="Screen capture utility"/> -->
 			<pkg path="_/pkg/backdrop" info="Nitpicker backdrop"/>
-			<pkg path="ehmry/pkg/flif_view/2019-03-22" info="FLIF file viewer (experimental)"/>
-			<pkg path="ehmry/pkg/grafx2/2019-03-19" info="Bitmap paint program (ported by cnuke)"/>
+			<!-- <pkg path="ehmry/pkg/flif_view/2019-03-22" info="FLIF file viewer (experimental)"/> -->
+			<pkg path="ehmry/pkg/grafx2/2019-05-24" info="Bitmap paint program (ported by cnuke)"/>
 		</index>
 
 		<index name="Network">
@@ -75,14 +80,20 @@
 			<pkg path="_/pkg/ninep" info="9P server"/>
 			<pkg path="_/pkg/ssh_client" info="SSH client"/>	
 			<pkg path="_/pkg/test-lwip_node" info="Standalone lwIP IPv6 node"/>
-			<pkg path="_/pkg/test-lwip_node" info="Standalone lwIP IPv6 node"/>
+		</index>
+
+		<index name="UI">
+			<pkg path="ehmry/pkg/themed_wm/2019-05-24" info="Window manager that should work"/>
+			<pkg path="_/pkg/wm" info="Base window manager"/>
+			<pkg path="_/pkg/motif_decorator" info="Motif style window decorator"/>
+			<pkg path="_/pkg/carn_layouter" info="Piling window layouter"/>
 		</index>
 
 		<index name="Other">
-			<pkg path="_/pkg/block_shred" info="Fill a block device with psuedo-random noise"/>
+			<!-- <pkg path="_/pkg/block_shred" info="Fill a block device with psuedo-random noise"/> -->
 			<pkg path="_/pkg/depot_9P" info="Serve /depot/local over 9P"/>
-			<pkg path="ehmry/pkg/jitter_sponge/2019-03-31" info="Entropy source"/>
-			<pkg path="ehmry/pkg/noux-build-x86/2019-03-20" info="Noux build environment"/>
+			<!-- <pkg path="ehmry/pkg/jitter_sponge/2019-03-31" info="Entropy source"/> -->
+			<!-- <pkg path="ehmry/pkg/noux-build-x86/2019-03-20" info="Noux build environment"/> -->
 			<pkg path="_/pkg/noux-system" info="Noux administration environment"/>
 		</index>
 	</index>
@@ -94,7 +105,7 @@
 			<pkg path="_/pkg/xspf_view" info="XSPF playlist viewer"/>
 		</index>
 		<pkg path="_/pkg/4do"/>
-		<pkg path="ehmry/pkg/avplay/2019-04-24"/>
+		<pkg path="ehmry/pkg/avplay/2019-05-24"/>
 		<pkg path="_/pkg/bluemsx"/>
 		<pkg path="_/pkg/cruzes" info="An unfinished Picross Libretro core"/>
 		<pkg path="_/pkg/ifm1"/>
@@ -105,6 +116,6 @@
 		<pkg path="_/pkg/testgl"/>
 	</index>
 
+	<pkg path="ehmry/pkg/fonts_fs/2019-05-24" info="Fonts provider"/>
 	<pkg path="_/pkg/chroot" info="Automatic file-system session partitioner"/>
-	<pkg path="cnuke/pkg/bsd_audio_drv/2019-03-21" info="Cnuke's audio driver"/>
 </index>

libretro/cores/Tuprules.tup

@@ -1,25 +1,25 @@
 # Implicit dependencies
 PKG_DEPENDS += \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
 	_/src/$(BIN_NAME) \
 	_/src/retro_frontend \
 
 !libretro_cc  = |> ^ CC %f^ \
 	$(CC) \
 		$(DEFINES) \
-		`pkg-config --cflags $(CORE_PKGS)` \
+		`$(PKG_CONFIG) --cflags $(CORE_PKGS)` \
 		$(CFLAGS) $(INCFLAGS) \
-		`pkg-config --cflags genode-lib` \
+		`$(PKG_CONFIG) --cflags genode-lib` \
 		-c %f -o %o \
 |> %f.$(TARGET_NAME).o
 
 !libretro_cxx = |> ^ CXX %f^ \
 	$(CXX) \
-		$(DEFINES) -std=gnu++11 \
-		`pkg-config --cflags $(CORE_PKGS)` \
+		$(DEFINES) \
+		`$(PKG_CONFIG) --cflags $(CORE_PKGS)` \
 		$(CXXFLAGS) $(INCFLAGS) \
-		`pkg-config --cflags genode-lib` \
+		`$(PKG_CONFIG) --cflags genode-lib` \
 		-c %f -o %o \
 |> %f.$(TARGET_NAME).o
 
@@ -27,8 +27,8 @@ PKG_DEPENDS += \
 	$(LD)  %f -o %o \
 		-shared --version-script=$(LINK_T) $(NO_UNDEFINED) \
 		$(LDFLAGS) \
-		`pkg-config --libs $(CORE_PKGS)` \
-		`pkg-config --libs genode-lib` \
+		`$(PKG_CONFIG) --libs $(CORE_PKGS)` \
+		`$(PKG_CONFIG) --libs genode-lib` \
 |> libretro.so
 
 LINK_T = $(TUP_CWD)/link.T

libretro/cores/bluemsx/Tuprules.tup

@@ -44,7 +44,7 @@ ifndef CONFIG_NO_NETWORK
 endif
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_STDCXX) \
 	_/raw/bluemsx \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>

libretro/cores/dosbox-libretro/Tuprules.tup

@@ -25,7 +25,7 @@ DEFINES += -DHAVE_MMAP
 : |> !bin |>
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_STDCXX) \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
 : |> !pkg |>

libretro/cores/dosbox-svn/Tuprules.tup

@@ -3,6 +3,13 @@ NO_UNDEFINED =
 	# Uses Genode API to create secondary stack
 #LIBRETRO_COMM_DIR =
 
+ifeq (@(TUP_ARCH),arm64)
+WITH_DYNAREC = arm64
+endif
+
+ifeq (@(TUP_ARCH),i386)
+WITH_DYNAREC = x86
+endif
 
 ifeq (@(TUP_ARCH),x86_64)
 WITH_DYNAREC = x86_64
@@ -32,7 +39,7 @@ SOURCES_CXX += $(LIBRETRO_COMM_DIR)/libco/genode.cpp
 : |> !bin |>
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_STDCXX) \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
 : |> !pkg |>

libretro/cores/dosbox-svn/upstream

@@ -1 +1 @@
-Subproject commit db2873d89fd5220b50592572a96a05674c9b09ae
+Subproject commit fe8f21212739a3ded2b06d80a27f4c06d4331996

libretro/cores/gambatte/Tuprules.tup

@@ -17,7 +17,8 @@ include upstream/Makefile.common
 : {core} |> !collect_bin |>
 : |> !bin |>
 
-PKG_DEPENDS += @(SDK_USER)/src/stdcxx/@(SDK_VERSION)
+PKG_DEPENDS += \
+	@(PUBLIC_SRC_STDCXX) \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
 : |> !pkg |>

libretro/cores/mgba/Tuprules.tup

@@ -1,11 +1,17 @@
 CORE_PKGS += libc libm
 
-CFLAGS += -O3
-CFLAGS += -DHAVE_STRNDUP -DHAVE_STRDUP -DDISABLE_THREADING
-
 include upstream/libretro-build/Makefile.common
 
-CFLAGS += $(RETRODEFS)
+DEFINES += -DMINIMAL_CORE=2 -DM_CORE_GBA -DM_CORE_GB
+DEFINES += -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_LOCALE -DHAVE_LOCALTIME_R
+DEFINES += -DINLINE=inline
+DEFINES += -DCOLOR_16_BIT -DCOLOR_5_6_5
+DEFINES += -DRESAMPLE_LIBRARY=2
+DEFINES += -DM_PI=3.14159265358979323846
+DEFINES += -DNDEBUG
+DEFINES += -DUSE_VFS_FILE
+
+CFLAGS += -O3
 CFLAGS += $(INCLUDES)
 
 : foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs}
@@ -15,7 +21,7 @@ CFLAGS += $(INCLUDES)
 : |> !bin |>
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_STDCXX) \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
 : |> !pkg |>

libretro/cores/mgba/upstream

@@ -1 +1 @@
-Subproject commit 443d67232b50dee7643b4084f1234f2c7a7c691e
+Subproject commit 03c7fac5b733d5eb7f2de59929b840333a4c553c

libretro/cores/mrboom/Tuprules.tup

@@ -22,7 +22,7 @@ include upstream/Makefile.common
 : |> !bin |>
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_STDCXX) \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
 : |> !pkg |>

libretro/cores/samples/Tuprules.tup

@@ -2,7 +2,7 @@ CORE_PKGS += libc libm
 LDFLAGS += --no-undefined
 CFLAGS += -O3 -Wall -pedantic -std=gnu99
 
-SIMPLE_DEPENDS = @(SDK_USER)/src/stdcxx/@(SDK_VERSION)
+SIMPLE_DEPENDS = @(PUBLIC_SRC_STDCXX)
 
 GL_DEPENDS = \
 	$(SIMPLE_DEPENDS) \

libretro/cores/snes9x/Tuprules.tup

@@ -19,7 +19,7 @@ CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
 : |> !bin |>
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_STDCXX) \
 
 : $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
 : |> !pkg |>

libretro/games/quake_dopa/Tupfile

@@ -1,3 +1,5 @@
+ifndef CONFIG_NO_NETWORK
+
 TARGET_NAME = quake_dopa
 RAW_VERSION = 2016-06-22
 include_rules
@@ -13,8 +15,14 @@ DOPA_FILES = \
 include $(RAW_RULES)
 
 PKG_DEPENDS += \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
+	_/src/tyrquake \
+	_/src/retro_frontend \
+	ehmry/raw/quake_shareware/1.06 \
 	_/raw/$(RAW_NAME) \
-	_/pkg/tyrquake \
 
 : runtime |> !collect_pkg_runtime |>
 include $(PKG_RULES)
+
+endif

libretro/games/streemerz/Tupfile

@@ -12,7 +12,10 @@ include_rules
 	|> $(RAW_DIR)/README.txt $(RAW_DIR)/streemerz-v02.nes {unzipped}
 
 PKG_DEPENDS += \
-	_/pkg/fceumm \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
+	_/src/fceumm \
+	_/src/retro_frontend \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>

libretro/tests/240pSuite-SNES/Tupfile

@@ -9,7 +9,11 @@ include_rules
 	|> $(RAW_DIR)/240pSuite.sfc $(RAW_DIR)/README.TXT {unzipped}
 
 PKG_DEPENDS += \
-	_/pkg/snes9x \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
+	@(PUBLIC_SRC_STDCXX) \
+	_/src/snes9x \
+	_/src/retro_frontend \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>

libretro/tests/240pee-NES/Tupfile

@@ -9,8 +9,13 @@ include_rules
 	|> $(RAW_DIR)/240pee.nes $(RAW_DIR)/240pee-bnrom.nes $(RAW_DIR)/README.md {unzipped}
 
 PKG_DEPENDS += \
-	_/pkg/fceumm \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
+	_/src/fceumm \
+	_/src/retro_frontend \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
+
 include $(RAW_RULES)
+include $(PKG_RULES)

libretro/topbench/dosbox-libretro/Tupfile

@@ -1,3 +1,3 @@
 TARGET_NAME = topbench_dosbox-libretro
-PKG_DEPENDS += _/pkg/dosbox
+PKG_DEPENDS += _/src/dosbox
 include_rules

libretro/topbench/dosbox-svn/Tupfile

@@ -1,3 +1,3 @@
 TARGET_NAME = topbench_dosbox-svn
-PKG_DEPENDS += _/pkg/dosbox_svn
+PKG_DEPENDS += _/src/dosbox_svn
 include_rules

nim/binaries.tup

@@ -1,5 +1,15 @@
+ifeq (@(TUP_ARCH),arm64)
+	CPU = arm64
+endif
+ifeq (@(TUP_ARCH),i386)
+	CPU = i386
+endif
+ifeq (@(TUP_ARCH),x86_64)
+	CPU = amd64
+endif
+
 !nim_build = |> ^o Nimble %B^ \
-	nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) --os:genode -d:posix --parallelBuild:1 -o:%B %f \
+	PKG_CONFIG_PATH=@(PKG_CONFIG_PATH) PATH=$PATH:@(TOOLCHAIN_PATH) nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) --cpu:$(CPU) --os:genode -d:posix --parallelBuild:1 -o:%B %f \
 |> %B ./<binaries>
 
 : foreach $(NIM_SRC_DIR)/*.nim |> !nim_build |> {binary}

nim/musicbrainz_playlist_generator

@@ -1 +1 @@
-Subproject commit 38462acefbb03254adca34387f763de1019e4aa8
+Subproject commit 3961d2ee7000236f9a35ac878d81643e0eb29d48

nim/ninep

@@ -1 +1 @@
-Subproject commit 739f74840b9de9f99bdbaec24f22e5f61e73481e
+Subproject commit 7889d655acdff0fcab8c939e93f7700ff6ea0d36

runtimes/audio_player/runtime

@@ -21,7 +21,7 @@
 	</content>
 
 	<config state="playing" scan_playlist="yes">
-		<vfs> <fs label="c4e7043e7b234309115c5e87b358b85623c84a35a39deff87a044d88814bd862" writeable="no"/> </vfs>
+		<vfs> <fs label="235dab7d754575a97e5b5f24dce4501f4b6019b3d7367dc6e9b051d83cdaf0b5" writeable="no"/> </vfs>
 	</config>
 
 </runtime>

runtimes/backdrop/Tupfile

@@ -1,7 +1,7 @@
 TARGET_NAME = backdrop
 
 PKG_DEPENDS += \
-	nfeske/pkg/backdrop/2019-02-22 \
+	$(PUBLIC_PKG_BACKDROP) \
 	_/raw/backdrop \
 
 include_rules
@@ -10,3 +10,4 @@ include_rules
 : runtime |> !collect_pkg_runtime |>
 
 include $(RAW_RULES)
+include $(PKG_RULES)

runtimes/ban.ai_multics/Tupfile

@@ -1,8 +1,8 @@
 TARGET_NAME = ban.ai_multics
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
 	@(PUBLIC_SRC_INIT) \
 	@(PUBLIC_SRC_LIBCRYPTO) \
 	@(PUBLIC_SRC_LIBSSH) \

runtimes/cave_story/Tuprules.tup

@@ -1,7 +1,6 @@
 PKG_DEPENDS += \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
 	_/src/nxengine \
 	_/src/retro_frontend \
 

runtimes/depot_9P/Tupfile

@@ -1,8 +1,8 @@
 TARGET_NAME = depot_9P
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
 	@(PUBLIC_SRC_VFS_LWIP) \
 	_/src/ninep \
 

runtimes/noux-system/Tupfile

@@ -6,11 +6,11 @@ PKG_DEPENDS += \
 	@(PUBLIC_SRC_INIT) \
 	@(PUBLIC_SRC_TERMINAL) \
 	@(PUBLIC_SRC_POSIX) \
-	genodelabs/src/noux/2019-03-17 \
-	genodelabs/src/bash-minimal/2019-02-25 \
-	genodelabs/src/vim-minimal/2019-02-25 \
-	genodelabs/src/coreutils-minimal/2019-02-25 \
-	genodelabs/src/ncurses/2019-02-25 \
+	@(PUBLIC_SRC_NOUX) \
+	@(PUBLIC_SRC_NCURSES) \
+	ehmry/src/bash-minimal/2019-05-24 \
+	ehmry/src/vim-minimal/2019-05-24 \
+	ehmry/src/coreutils-minimal/2019-05-24 \
 
 include_rules
 

runtimes/noux-system/runtime

@@ -10,8 +10,6 @@
 	</requires>
 
 	<content>
-		<rom label="noux-system.config"/>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="init"/>

runtimes/soyuz/Tupfile

@@ -3,10 +3,10 @@ ifndef CONFIG_NO_NETWORK
 TARGET_NAME = soyuz
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
-	_/src/dosbox-libretro \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
+	@(PUBLIC_SRC_STDCXX) \
+	_/src/dosbox \
 	_/src/retro_frontend \
 	_/raw/soyuz \
 

src/app/show_input/Tupfile

@@ -2,7 +2,6 @@ TARGET_NAME = show_input
 include_rules
 
 PKG_CONFIGS = vfs genode-gems genode-os genode-prg
-CXXFLAGS += -std=gnu++11
 CXXFLAGS += `$(PKG_CONFIG) -cflags $(PKG_CONFIGS)`
 LDFLAGS += `$(PKG_CONFIG) -libs $(PKG_CONFIGS)`
 

src/server/fs_block/Tupfile

@@ -1,13 +1,17 @@
+ifndef SKIP_INCOMPATIBLE
+
 TARGET_NAME = fs_block
 include_rules
 
 PKGS = genode-os genode-prg
+CXXFLAGS += `$(PKG_CONFIG) --cflags $(PKGS)`
 
-: foreach *.cc |> ^ CC %o^ \
-	$(CC) -std=gnu++11 `pkg-config --cflags $(PKGS)` -c %f -o %o |> %B.o {objs}
+: foreach *.cc |> !cxx |> %B.o {objs}
 
 : {objs} |> ^o LD %o^ \
-	$(LD) `pkg-config --libs $(PKGS)` %f -o %o |> %d {binary}
+	$(LD) `$(PKG_CONFIG) --libs $(PKGS)` %f -o %o |> %d {binary}
 
 : {binary} |> !collect_bin |>
 include $(BIN_RULES)
+
+endif

src/server/fs_block/component.cc

@@ -58,7 +58,7 @@ class Fs_block::Session_component final : private Block_buffer,
 
 		Genode::Heap              &_heap;
 		Genode::Allocator_avl      _fs_tx_alloc { &_heap };
-		File_system::Connection    _fs;
+		File_system::Connection<void>     _fs;
 		Signal_handler<Session_component> _fs_handler;
 		Signal_handler<Session_component> _blk_handler;
 		File_system::File_handle   _handle { ~0U };

src/server/nic_bus/Tupfile

@@ -2,12 +2,12 @@ TARGET_NAME = nic_bus
 include_rules
 
 PKGS = genode-os genode-prg
+CXXFLAGS += `$(PKG_CONFIG) --cflags $(PKGS)`
 
-: foreach *.cc |> ^ CC %o^ \
-	$(CC) -std=gnu++11 `pkg-config --cflags $(PKGS)` -c %f -o %o |> %B.o {objs}
+: foreach *.cc |> !cxx |> %B.o {objs}
 
 : {objs} |> ^o LD %o^ \
-	$(LD) `pkg-config --libs $(PKGS)` %f -o %o |> %d {binary}
+	$(LD) `$(PKG_CONFIG) --libs $(PKGS)` %f -o %o |> %d {binary}
 
 : {binary} |> !collect_bin |>
 

vm/alpine/Tuprules.tup

@@ -1,3 +0,0 @@
-ALPINE_VERSION_MAJOR = 3.9
-ALPINE_VERSION_MINOR = 3
-ALPINE_VERSION = $(ALPINE_VERSION_MAJOR).$(ALPINE_VERSION_MINOR)

vm/alpine/alpine_seoul_nova/Tupfile

@@ -1,11 +0,0 @@
-TARGET_NAME = alpine_seoul_nova
-include_rules
-
-PKG_DEPENDS += \
-	@(PUBLIC_SRC_BASE_NOVA) \
-	@(PUBLIC_SRC_INIT) \
-	@(PUBLIC_SRC_SEOUL_NOVA) \
-
-: runtime |> !collect_pkg_runtime |>
-
-include $(PKG_RULES)

vm/alpine/alpine_seoul_nova/installer/Tupfile

@@ -1,16 +0,0 @@
-TARGET_NAME = alpine_seoul_nova_installer
-include_rules
-
-PKG_DEPENDS += \
-	@(PUBLIC_SRC_BASE_NOVA) \
-	@(PUBLIC_SRC_INIT) \
-	@(PUBLIC_SRC_ROM_BLOCK) \
-	@(PUBLIC_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)

vm/alpine/alpine_seoul_nova/runtime

@@ -1,110 +0,0 @@
-<runtime ram="1380M" caps="2200" binary="init">
-
-	<requires>
-		<block/>
-		<file_system/>
-		<nic/>
-		<rom label="platform_info"/>
-		<nitpicker/>
-		<rm/>
-		<rtc/>
-	</requires>
-
-	<content>
-		<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="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="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>
-				<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>
-				<any-service><parent/></any-service>
-			</route>
-			<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>
-
-</runtime>

vm/alpine/media/Tuprules.tup

@@ -1 +0,0 @@
-ISO_ROM_RULES = $(TUP_CWD)/iso_rom_rules.tup

vm/alpine/media/iso_rom_rules.tup

@@ -1,28 +0,0 @@
-ifndef CONFIG_NO_NETWORK
-
-include ../version.tup
-TARGET_NAME = alpine-$(RELEASE_TYPE)-$(RELEASE_ARCH)
-RAW_VERSION = $(ALPINE_VERSION)
-PKG_VERSION = $(ALPINE_VERSION)
-
-include_rules
-
-ISO_NAME = alpine-$(RELEASE_TYPE)-$(ALPINE_VERSION)-$(RELEASE_ARCH).iso
-ISO_URL = http://dl-cdn.alpinelinux.org/alpine/v$(ALPINE_VERSION_MAJOR)/releases/$(RELEASE_ARCH)/$(ISO_NAME)
-
-: |> wget --quiet $(ISO_URL) -O %o |> $(RAW_DIR)/$(ISO_NAME) {iso}
-
-: {iso} |> \
-	wget --quiet $(ISO_URL).asc -O %o; gpg --verify %o; \
-|> $(RAW_DIR)/$(ISO_NAME).asc
-
-: |> !raw |>
-
-PKG_DEPENDS += \
-	@(PUBLIC_SRC_ROM_BLOCK) \
-	_/raw/$(TARGET_NAME) \
-
-: $(TUP_CWD)/runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
-: runtime |> !collect_pkg_runtime |>
-
-endif

vm/alpine/media/runtime.in

@@ -1,12 +0,0 @@
-<runtime ram="2M" caps="128" binary="rom_block">
-
-	<provides> <block/> </provides>
-
-	<content>
-		<rom label="rom_block"/>
-		<rom label="@ISO_NAME@"/>
-	</content>
-
-	<config file="@ISO_NAME@" block_size="2048"/>
-
-</runtime>

vm/alpine/media/standard-x86/Tupfile

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

vm/alpine/media/virtual-x86/Tupfile

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

vm/alpine/media/virtual-x86_64/Tupfile

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

vm/alpine/version.tup

@@ -1,3 +0,0 @@
-ALPINE_VERSION_MAJOR = 3.9
-ALPINE_VERSION_MINOR = 3
-ALPINE_VERSION = $(ALPINE_VERSION_MAJOR).$(ALPINE_VERSION_MINOR)

vm/fetchers/Tuprules.tup

@@ -7,9 +7,8 @@ error SHA256 not defined
 endif
 
 PKG_DEPENDS += \
-	@(SDK_USER)/src/init/@(SDK_VERSION) \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
+	@(PUBLIC_SRC_VFS) \
+	@(PUBLIC_SRC_LIBC) \
 	@(PUBLIC_SRC_INIT) \
 	@(PUBLIC_SRC_LIBPNG) \
 	@(PUBLIC_SRC_LIBSSL) \

vm/fetchers/openbsd_i386/Tupfile

@@ -1,4 +0,0 @@
-TARGET_NAME = fetch_openbsd_i386
-URL = https://cdn.openbsd.org/pub/OpenBSD/6.5/i386/install65.iso
-SHA256 = 8fcb4b6582836237e1f979806700c90dbeb93ad903e41a0aad588e771c3c7548
-include_rules

vm/openbsd/install/Tupfile

@@ -1,30 +0,0 @@
-ifdef YES_REALLY_DO_IT
-
-TARGET_NAME = openbsd_install
-IMAGE_TYPE = install
-RAW_NAME = openbsd-$(IMAGE_TYPE)-i386
-include ../version.tup
-IMAGE_NAME = $(IMAGE_TYPE)$(VERSION).fs
-
-include_rules
-
-URL_BASE = https://cdn.openbsd.org/pub/OpenBSD/$(RAW_VERSION)/i386
-
-: |> wget --quiet $(URL_BASE)/SHA256.sig -O %o |> $(RAW_DIR)/SHA256.sig
-
-: $(RAW_DIR)/SHA256.sig  |> \
-	wget --quiet $(URL_BASE)/SHA256 -O %o;  \
-|> $(RAW_DIR)/SHA256
-
-: ../openbsd-65-base.pub |> cp %f %o |> $(RAW_DIR)/openbsd-65-base.pub
-
-: $(RAW_DIR)/openbsd-65-base.pub $(RAW_DIR)/SHA256 $(RAW_DIR)/SHA256.sig |> \
-	wget --quiet $(URL_BASE)/$(IMAGE_NAME) -O %o; \
-	cd $(RAW_DIR); \
-	sha256sum -c --ignore-missing SHA256; \
-	signify-openbsd -Cp openbsd-65-base.pub -x SHA256.sig *.fs; \
-|> $(RAW_DIR)/$(IMAGE_NAME)
-
-include $(RAW_RULES)
-
-endif

vm/openbsd/miniroot/Tupfile

@@ -1,26 +0,0 @@
-TARGET_NAME = openbsd_miniroot
-IMAGE_TYPE = miniroot
-RAW_NAME = openbsd-$(IMAGE_TYPE)-i386
-include ../version.tup
-IMAGE_NAME = $(IMAGE_TYPE)$(VERSION).fs
-
-include_rules
-
-URL_BASE = https://cdn.openbsd.org/pub/OpenBSD/$(RAW_VERSION)/i386
-
-: |> wget --quiet $(URL_BASE)/SHA256.sig -O %o |> $(RAW_DIR)/SHA256.sig
-
-: $(RAW_DIR)/SHA256.sig  |> \
-	wget --quiet $(URL_BASE)/SHA256 -O %o;  \
-|> $(RAW_DIR)/SHA256
-
-: ../openbsd-65-base.pub |> cp %f %o |> $(RAW_DIR)/openbsd-65-base.pub
-
-: $(RAW_DIR)/openbsd-65-base.pub $(RAW_DIR)/SHA256 $(RAW_DIR)/SHA256.sig |> \
-	wget --quiet $(URL_BASE)/$(IMAGE_NAME) -O %o; \
-	cd $(RAW_DIR); \
-	sha256sum -c --ignore-missing SHA256; \
-	signify-openbsd -Cp openbsd-65-base.pub -x SHA256.sig *.fs; \
-|> $(RAW_DIR)/$(IMAGE_NAME)
-
-include $(RAW_RULES)

vm/reactos/Tupfile

@@ -1,24 +0,0 @@
-ifndef CONFIG_NO_NETWORK
-
-TARGET_NAME = ReactOS-live
-RAW_VERSION = 0.4.11
-include_rules
-
-ZIP_NAME = ReactOS-$(RAW_VERSION)-live.zip
-ISO_NAME = ReactOS-$(RAW_VERSION)-Live.iso
-
-: |> \
-	wget --quiet https://downloads.sourceforge.net/project/reactos/ReactOS/$(RAW_VERSION)/$(ZIP_NAME) -O %o.zip; \
-	unzip %o.zip -d $(RAW_DIR); rm %o.zip; \
-|> $(RAW_DIR)/$(ISO_NAME) {iso}
-
-PKG_DEPENDS += \
-	@(PUBLIC_SRC_ROM_BLOCK) \
-	_/raw/$(TARGET_NAME) \
-
-: runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
-: runtime |> !collect_pkg_runtime |>
-
-include $(RAW_RULES)
-
-endif

vm/reactos/runtime.in

@@ -1,12 +0,0 @@
-<runtime ram="2M" caps="128" binary="rom_block">
-
-	<provides> <block/> </provides>
-
-	<content>
-		<rom label="rom_block"/>
-		<rom label="@ISO_NAME@"/>
-	</content>
-
-	<config file="@ISO_NAME@" block_size="2048"/>
-
-</runtime>