diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2c70ef2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/toolchain-*
+/sdk-*
+.tup
diff --git a/.gitmodules b/.gitmodules
index 128631f..002df13 100644
--- a/.gitmodules
+++ b/.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
diff --git a/Tuprules.tup b/Tuprules.tup
index f0c6a7a..f209040 100644
--- a/Tuprules.tup
+++ b/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
diff --git a/build-x86_64/tup.config b/build-x86_64/tup.config
index 8bbfe22..5dc2710 100644
--- a/build-x86_64/tup.config
+++ b/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
diff --git a/index.xml b/index.xml
index e7055f8..76cef5b 100644
--- a/index.xml
+++ b/index.xml
@@ -19,7 +19,7 @@
-
+
@@ -28,12 +28,12 @@
-
-
+
+
-
+
@@ -60,11 +60,16 @@
+
+
+
+
+
-
-
+
+
@@ -75,14 +80,20 @@
-
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -94,7 +105,7 @@
-
+
@@ -105,6 +116,6 @@
+
-
diff --git a/libretro/cores/Tuprules.tup b/libretro/cores/Tuprules.tup
index 893aac6..ae995af 100644
--- a/libretro/cores/Tuprules.tup
+++ b/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
diff --git a/libretro/cores/bluemsx/Tuprules.tup b/libretro/cores/bluemsx/Tuprules.tup
index 154edd0..cf021c6 100644
--- a/libretro/cores/bluemsx/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/cores/dosbox-libretro/Tuprules.tup b/libretro/cores/dosbox-libretro/Tuprules.tup
index c538478..41f0a75 100644
--- a/libretro/cores/dosbox-libretro/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/cores/dosbox-svn/Tuprules.tup b/libretro/cores/dosbox-svn/Tuprules.tup
index dbfad95..b187494 100644
--- a/libretro/cores/dosbox-svn/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/cores/dosbox-svn/upstream b/libretro/cores/dosbox-svn/upstream
index db2873d..fe8f212 160000
--- a/libretro/cores/dosbox-svn/upstream
+++ b/libretro/cores/dosbox-svn/upstream
@@ -1 +1 @@
-Subproject commit db2873d89fd5220b50592572a96a05674c9b09ae
+Subproject commit fe8f21212739a3ded2b06d80a27f4c06d4331996
diff --git a/libretro/cores/gambatte/Tuprules.tup b/libretro/cores/gambatte/Tuprules.tup
index 1eb0c0d..fe0ff64 100644
--- a/libretro/cores/gambatte/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/cores/mgba/Tuprules.tup b/libretro/cores/mgba/Tuprules.tup
index 3562183..1f3e662 100644
--- a/libretro/cores/mgba/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/cores/mgba/upstream b/libretro/cores/mgba/upstream
index 443d672..03c7fac 160000
--- a/libretro/cores/mgba/upstream
+++ b/libretro/cores/mgba/upstream
@@ -1 +1 @@
-Subproject commit 443d67232b50dee7643b4084f1234f2c7a7c691e
+Subproject commit 03c7fac5b733d5eb7f2de59929b840333a4c553c
diff --git a/libretro/cores/mrboom/Tuprules.tup b/libretro/cores/mrboom/Tuprules.tup
index 91a837a..0d28edf 100644
--- a/libretro/cores/mrboom/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/cores/samples/Tuprules.tup b/libretro/cores/samples/Tuprules.tup
index c4483df..77fb186 100644
--- a/libretro/cores/samples/Tuprules.tup
+++ b/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) \
diff --git a/libretro/cores/snes9x/Tuprules.tup b/libretro/cores/snes9x/Tuprules.tup
index cc7f813..2fa0aa4 100644
--- a/libretro/cores/snes9x/Tuprules.tup
+++ b/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 |>
diff --git a/libretro/games/quake_dopa/Tupfile b/libretro/games/quake_dopa/Tupfile
index 206af80..285b610 100644
--- a/libretro/games/quake_dopa/Tupfile
+++ b/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
diff --git a/libretro/games/streemerz/Tupfile b/libretro/games/streemerz/Tupfile
index f79a622..5be6f61 100644
--- a/libretro/games/streemerz/Tupfile
+++ b/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 |>
diff --git a/libretro/tests/240pSuite-SNES/Tupfile b/libretro/tests/240pSuite-SNES/Tupfile
index f88195c..dae793c 100644
--- a/libretro/tests/240pSuite-SNES/Tupfile
+++ b/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 |>
diff --git a/libretro/tests/240pee-NES/Tupfile b/libretro/tests/240pee-NES/Tupfile
index bb6f67e..2613680 100644
--- a/libretro/tests/240pee-NES/Tupfile
+++ b/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)
diff --git a/libretro/topbench/dosbox-libretro/Tupfile b/libretro/topbench/dosbox-libretro/Tupfile
index b87ecad..0933f52 100644
--- a/libretro/topbench/dosbox-libretro/Tupfile
+++ b/libretro/topbench/dosbox-libretro/Tupfile
@@ -1,3 +1,3 @@
TARGET_NAME = topbench_dosbox-libretro
-PKG_DEPENDS += _/pkg/dosbox
+PKG_DEPENDS += _/src/dosbox
include_rules
diff --git a/libretro/topbench/dosbox-svn/Tupfile b/libretro/topbench/dosbox-svn/Tupfile
index b86524f..720a8d3 100644
--- a/libretro/topbench/dosbox-svn/Tupfile
+++ b/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
diff --git a/nim/binaries.tup b/nim/binaries.tup
index 79d2ffe..bc0c04f 100644
--- a/nim/binaries.tup
+++ b/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 ./
: foreach $(NIM_SRC_DIR)/*.nim |> !nim_build |> {binary}
diff --git a/nim/musicbrainz_playlist_generator b/nim/musicbrainz_playlist_generator
index 38462ac..3961d2e 160000
--- a/nim/musicbrainz_playlist_generator
+++ b/nim/musicbrainz_playlist_generator
@@ -1 +1 @@
-Subproject commit 38462acefbb03254adca34387f763de1019e4aa8
+Subproject commit 3961d2ee7000236f9a35ac878d81643e0eb29d48
diff --git a/nim/ninep b/nim/ninep
index 739f748..7889d65 160000
--- a/nim/ninep
+++ b/nim/ninep
@@ -1 +1 @@
-Subproject commit 739f74840b9de9f99bdbaec24f22e5f61e73481e
+Subproject commit 7889d655acdff0fcab8c939e93f7700ff6ea0d36
diff --git a/runtimes/audio_player/runtime b/runtimes/audio_player/runtime
index 4c940d0..a38337f 100644
--- a/runtimes/audio_player/runtime
+++ b/runtimes/audio_player/runtime
@@ -21,7 +21,7 @@
-
+
diff --git a/runtimes/backdrop/Tupfile b/runtimes/backdrop/Tupfile
index 42d9989..28badb3 100644
--- a/runtimes/backdrop/Tupfile
+++ b/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)
diff --git a/runtimes/ban.ai_multics/Tupfile b/runtimes/ban.ai_multics/Tupfile
index 33360c7..eddc6e4 100644
--- a/runtimes/ban.ai_multics/Tupfile
+++ b/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) \
diff --git a/runtimes/cave_story/Tuprules.tup b/runtimes/cave_story/Tuprules.tup
index 41050ee..61ca6da 100644
--- a/runtimes/cave_story/Tuprules.tup
+++ b/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 \
diff --git a/runtimes/depot_9P/Tupfile b/runtimes/depot_9P/Tupfile
index 9182f2c..558527d 100644
--- a/runtimes/depot_9P/Tupfile
+++ b/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 \
diff --git a/runtimes/noux-system/Tupfile b/runtimes/noux-system/Tupfile
index 14a4c35..6a123c4 100644
--- a/runtimes/noux-system/Tupfile
+++ b/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
diff --git a/runtimes/noux-system/runtime b/runtimes/noux-system/runtime
index 0873348..627f605 100755
--- a/runtimes/noux-system/runtime
+++ b/runtimes/noux-system/runtime
@@ -10,8 +10,6 @@
-
-
diff --git a/runtimes/soyuz/Tupfile b/runtimes/soyuz/Tupfile
index 6d7dcf7..2bd93b9 100644
--- a/runtimes/soyuz/Tupfile
+++ b/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 \
diff --git a/src/app/show_input/Tupfile b/src/app/show_input/Tupfile
index 7032e10..0846365 100644
--- a/src/app/show_input/Tupfile
+++ b/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)`
diff --git a/src/server/fs_block/Tupfile b/src/server/fs_block/Tupfile
index 7756e37..2a0fa7e 100644
--- a/src/server/fs_block/Tupfile
+++ b/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
diff --git a/src/server/fs_block/component.cc b/src/server/fs_block/component.cc
index 991430e..9b05891 100644
--- a/src/server/fs_block/component.cc
+++ b/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 _fs;
Signal_handler _fs_handler;
Signal_handler _blk_handler;
File_system::File_handle _handle { ~0U };
diff --git a/src/server/nic_bus/Tupfile b/src/server/nic_bus/Tupfile
index cfbc10b..2d11f15 100644
--- a/src/server/nic_bus/Tupfile
+++ b/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 |>
diff --git a/vm/alpine/Tuprules.tup b/vm/alpine/Tuprules.tup
deleted file mode 100644
index 7237561..0000000
--- a/vm/alpine/Tuprules.tup
+++ /dev/null
@@ -1,3 +0,0 @@
-ALPINE_VERSION_MAJOR = 3.9
-ALPINE_VERSION_MINOR = 3
-ALPINE_VERSION = $(ALPINE_VERSION_MAJOR).$(ALPINE_VERSION_MINOR)
diff --git a/vm/alpine/alpine_seoul_nova/Tupfile b/vm/alpine/alpine_seoul_nova/Tupfile
deleted file mode 100644
index 87b7819..0000000
--- a/vm/alpine/alpine_seoul_nova/Tupfile
+++ /dev/null
@@ -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)
diff --git a/vm/alpine/alpine_seoul_nova/installer/Tupfile b/vm/alpine/alpine_seoul_nova/installer/Tupfile
deleted file mode 100644
index 3d34c6f..0000000
--- a/vm/alpine/alpine_seoul_nova/installer/Tupfile
+++ /dev/null
@@ -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)
diff --git a/vm/alpine/alpine_seoul_nova/runtime b/vm/alpine/alpine_seoul_nova/runtime
deleted file mode 100644
index 9a57a99..0000000
--- a/vm/alpine/alpine_seoul_nova/runtime
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vm/alpine/media/Tuprules.tup b/vm/alpine/media/Tuprules.tup
deleted file mode 100644
index f796d64..0000000
--- a/vm/alpine/media/Tuprules.tup
+++ /dev/null
@@ -1 +0,0 @@
-ISO_ROM_RULES = $(TUP_CWD)/iso_rom_rules.tup
diff --git a/vm/alpine/media/iso_rom_rules.tup b/vm/alpine/media/iso_rom_rules.tup
deleted file mode 100644
index 1589b22..0000000
--- a/vm/alpine/media/iso_rom_rules.tup
+++ /dev/null
@@ -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
diff --git a/vm/alpine/media/runtime.in b/vm/alpine/media/runtime.in
deleted file mode 100644
index 516429b..0000000
--- a/vm/alpine/media/runtime.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vm/alpine/media/standard-x86/Tupfile b/vm/alpine/media/standard-x86/Tupfile
deleted file mode 100644
index f41ea95..0000000
--- a/vm/alpine/media/standard-x86/Tupfile
+++ /dev/null
@@ -1,3 +0,0 @@
-RELEASE_TYPE = standard
-RELEASE_ARCH = x86
-include ../iso_rom_rules.tup
diff --git a/vm/alpine/media/virtual-x86/Tupfile b/vm/alpine/media/virtual-x86/Tupfile
deleted file mode 100644
index e95ebed..0000000
--- a/vm/alpine/media/virtual-x86/Tupfile
+++ /dev/null
@@ -1,3 +0,0 @@
-RELEASE_TYPE = virt
-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
deleted file mode 100644
index f671695..0000000
--- a/vm/alpine/media/virtual-x86_64/Tupfile
+++ /dev/null
@@ -1,3 +0,0 @@
-RELEASE_TYPE = virt
-RELEASE_ARCH = x86_64
-include ../iso_rom_rules.tup
diff --git a/vm/alpine/version.tup b/vm/alpine/version.tup
deleted file mode 100644
index 7237561..0000000
--- a/vm/alpine/version.tup
+++ /dev/null
@@ -1,3 +0,0 @@
-ALPINE_VERSION_MAJOR = 3.9
-ALPINE_VERSION_MINOR = 3
-ALPINE_VERSION = $(ALPINE_VERSION_MAJOR).$(ALPINE_VERSION_MINOR)
diff --git a/vm/fetchers/Tuprules.tup b/vm/fetchers/Tuprules.tup
index dfb7ec2..d4de327 100644
--- a/vm/fetchers/Tuprules.tup
+++ b/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) \
diff --git a/vm/fetchers/openbsd_i386/Tupfile b/vm/fetchers/openbsd_i386/Tupfile
deleted file mode 100644
index 33e4355..0000000
--- a/vm/fetchers/openbsd_i386/Tupfile
+++ /dev/null
@@ -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
diff --git a/vm/openbsd/install/Tupfile b/vm/openbsd/install/Tupfile
deleted file mode 100644
index f8f7a3d..0000000
--- a/vm/openbsd/install/Tupfile
+++ /dev/null
@@ -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
diff --git a/vm/openbsd/miniroot/Tupfile b/vm/openbsd/miniroot/Tupfile
deleted file mode 100644
index fc042a2..0000000
--- a/vm/openbsd/miniroot/Tupfile
+++ /dev/null
@@ -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)
diff --git a/vm/reactos/Tupfile b/vm/reactos/Tupfile
deleted file mode 100644
index 01723d0..0000000
--- a/vm/reactos/Tupfile
+++ /dev/null
@@ -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
diff --git a/vm/reactos/runtime.in b/vm/reactos/runtime.in
deleted file mode 100644
index 516429b..0000000
--- a/vm/reactos/runtime.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-