From 74090333a965c5451a9e136de2a3318c5d6d39a0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 31 Jul 2019 13:31:16 +0200 Subject: [PATCH] Dhall packaging update --- dhall | 2 +- libretro/cores/2048/pkg.dhall | 4 +- libretro/cores/fceumm/pkg.dhall | 3 +- libretro/cores/gambatte/pkg.dhall | 4 +- libretro/cores/mgba/pkg.dhall | 4 +- libretro/cores/snes9x/pkg.dhall | 6 +- libretro/cores/tyrquake/pkg.dhall | 6 +- libretro/pkgDefaults.dhall | 8 +- libretro/tests/240pee-NES/runtime | 39 -------- libretro/tests/topbench/pkg.dhall | 6 +- libretro/tests/topbench/runtime | 39 -------- runtimes/backdrop/pkg.dhall | 6 +- runtimes/icy-streams/pkg.dhall | 96 +++++++++---------- runtimes/noux-system/pkg.dhall | 153 +++++++++++++++--------------- src/nic_bus/Tupfile | 2 +- src/nic_bus/pkg.dhall | 6 +- 16 files changed, 146 insertions(+), 238 deletions(-) delete mode 100644 libretro/tests/240pee-NES/runtime delete mode 100644 libretro/tests/topbench/runtime diff --git a/dhall b/dhall index abd76668a..4b03fc71a 160000 --- a/dhall +++ b/dhall @@ -1 +1 @@ -Subproject commit abd76668aeba6ebdd8396f7ec4d9c74b5b426f04 +Subproject commit 4b03fc71a4529cc35cef9dfe9d95ec431f8246e6 diff --git a/libretro/cores/2048/pkg.dhall b/libretro/cores/2048/pkg.dhall index 2baaa2e26..da1ce086b 100644 --- a/libretro/cores/2048/pkg.dhall +++ b/libretro/cores/2048/pkg.dhall @@ -16,8 +16,8 @@ in { indexInfo = "Threes! clone" , runtime = defaults.runtime - ⫽ { ram = - Genode.units.MiB 4 + ⫽ { resources = + { caps = 128, ram = Genode.units.MiB 4 } , requires = List/map Text Service service [ "file_system", "nitpicker" ] , config = diff --git a/libretro/cores/fceumm/pkg.dhall b/libretro/cores/fceumm/pkg.dhall index cf9534e9e..bdc885302 100644 --- a/libretro/cores/fceumm/pkg.dhall +++ b/libretro/cores/fceumm/pkg.dhall @@ -5,5 +5,6 @@ let defaults = ./../../pkgJoypadDefaults.dhall in { indexInfo = "NES emulator" , runtime = - defaults.runtime ⫽ { ram = Genode.units.MiB 16 } + defaults.runtime + ⫽ { resources = { caps = 128, ram = Genode.units.MiB 16 } } } diff --git a/libretro/cores/gambatte/pkg.dhall b/libretro/cores/gambatte/pkg.dhall index 19d6bd624..fa5400713 100644 --- a/libretro/cores/gambatte/pkg.dhall +++ b/libretro/cores/gambatte/pkg.dhall @@ -6,8 +6,8 @@ in { indexInfo = "Game Boy Emulator" , runtime = defaults.runtime - ⫽ { ram = - Genode.units.MiB 8 + ⫽ { resources = + { caps = 128, ram = Genode.units.MiB 8 } , roms = defaults.runtime.roms # [ "stdcxx.lib.so" ] } diff --git a/libretro/cores/mgba/pkg.dhall b/libretro/cores/mgba/pkg.dhall index 328d8b442..a7b787aa1 100644 --- a/libretro/cores/mgba/pkg.dhall +++ b/libretro/cores/mgba/pkg.dhall @@ -10,8 +10,8 @@ in { indexInfo = "Game Boy Advance Emulator" , runtime = defaults.runtime - ⫽ { ram = - Genode.units.MiB 64 + ⫽ { resources = + { caps = 128, ram = Genode.units.MiB 64 } , roms = defaults.runtime.roms # [ "stdcxx.lib.so" ] , config = diff --git a/libretro/cores/snes9x/pkg.dhall b/libretro/cores/snes9x/pkg.dhall index e6a24e69b..3b7b0c43b 100644 --- a/libretro/cores/snes9x/pkg.dhall +++ b/libretro/cores/snes9x/pkg.dhall @@ -10,10 +10,8 @@ in { indexInfo = defaults.runtime ⫽ { roms = defaults.runtime.roms # [ "stdcxx.lib.so" ] - , ram = - Genode.units.MiB 24 - , caps = - 192 + , resources = + { caps = 192, ram = Genode.units.MiB 24 } , config = XML.text '' diff --git a/libretro/cores/tyrquake/pkg.dhall b/libretro/cores/tyrquake/pkg.dhall index 6556d6ef6..b0fcd785e 100644 --- a/libretro/cores/tyrquake/pkg.dhall +++ b/libretro/cores/tyrquake/pkg.dhall @@ -31,10 +31,8 @@ in { indexInfo = "QUAKE engine" , runtime = defaults.runtime - ⫽ { ram = - Genode.units.MiB 64 - , caps = - 256 + ⫽ { resources = + { caps = 256, ram = Genode.units.MiB 64 } , roms = defaults.runtime.roms # [ "quake_shareware.tar" ] , config = diff --git a/libretro/pkgDefaults.dhall b/libretro/pkgDefaults.dhall index 6171c5e46..131b4f1cf 100644 --- a/libretro/pkgDefaults.dhall +++ b/libretro/pkgDefaults.dhall @@ -10,11 +10,7 @@ let Runtime/Require = types.Runtime/Require in { runtime = Genode.Runtime.defaults - ⫽ { ram = - Genode.units.MiB 32 - , caps = - 128 - , binary = + ⫽ { binary = "retro_frontend" , requires = List/map @@ -22,6 +18,8 @@ in { runtime = Runtime/Require Genode.Runtime.Require.require [ "audio_out", "file_system", "nitpicker", "rm" ] + , resources = + { caps = 128, ram = Genode.units.MiB 32 } , roms = [ "retro_frontend" , "libc.lib.so" diff --git a/libretro/tests/240pee-NES/runtime b/libretro/tests/240pee-NES/runtime deleted file mode 100644 index 0cb93df31..000000000 --- a/libretro/tests/240pee-NES/runtime +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libretro/tests/topbench/pkg.dhall b/libretro/tests/topbench/pkg.dhall index c2084e1ac..a435326b6 100644 --- a/libretro/tests/topbench/pkg.dhall +++ b/libretro/tests/topbench/pkg.dhall @@ -10,10 +10,8 @@ in { indexInfo = "The Oldskool PC Benchmark - DOSBox" , runtime = defaults.runtime - ⫽ { caps = - 192 - , ram = - Genode.units.MiB 96 + ⫽ { resources = + { caps = 192, ram = Genode.units.MiB 96 } , requires = defaults.runtime.requires # [ require "report", require "rtc" ] , roms = diff --git a/libretro/tests/topbench/runtime b/libretro/tests/topbench/runtime deleted file mode 100644 index 4934ae952..000000000 --- a/libretro/tests/topbench/runtime +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -[autoexec] -mount c /drive_c -c: -TOPBENCH.EXE - - - - - - - - - - - diff --git a/runtimes/backdrop/pkg.dhall b/runtimes/backdrop/pkg.dhall index 75407f7a9..3c29eeb38 100644 --- a/runtimes/backdrop/pkg.dhall +++ b/runtimes/backdrop/pkg.dhall @@ -8,10 +8,8 @@ in { indexInfo = "Desktop backdrop image" , runtime = Genode.Runtime.defaults - ⫽ { ram = - Genode.units.MiB 64 - , caps = - 300 + ⫽ { resources = + { ram = Genode.units.MiB 8, caps = 96 } , binary = "backdrop" , requires = diff --git a/runtimes/icy-streams/pkg.dhall b/runtimes/icy-streams/pkg.dhall index 50cd9fa93..513d47af2 100644 --- a/runtimes/icy-streams/pkg.dhall +++ b/runtimes/icy-streams/pkg.dhall @@ -8,10 +8,8 @@ let config = λ ( url : Text ) - → { ram = - Genode.units.MiB 32 - , caps = - 768 + → { resources = + { ram = Genode.units.MiB 32, caps = 768 } , requires = [ service "audio_out" , service "nic" @@ -33,51 +31,51 @@ let config = , config = XML.text '' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - '' + + + + + + + + + + + + + + + '' } -in λ(url : Text) → { runtime = Genode.Runtime.defaults // (config url) } +in λ(url : Text) → { runtime = Genode.Runtime.defaults ⫽ config url } diff --git a/runtimes/noux-system/pkg.dhall b/runtimes/noux-system/pkg.dhall index 1e71da473..0b454bfda 100644 --- a/runtimes/noux-system/pkg.dhall +++ b/runtimes/noux-system/pkg.dhall @@ -8,16 +8,86 @@ let service = λ(s : Text) → { service = s, label = None Text } let serviceLabel = λ(s : Text) → λ(l : Text) → { service = s, label = Some l } -let fsService = λ(l : Text) → serviceLabel "file_system" l +let fsService = λ(label : Text) → serviceLabel "file_system" label + +let Noux = Genode.Components.Noux + +let Terminal = Genode.Components.Terminal + +let terminal = + Terminal.construct + ( Terminal.defaults + ⫽ { routes = + { fontsFs = + Genode.Route.parent (Some "fonts") + , nitpicker = + Genode.Route.parent (None Text) + , timer = + Genode.Route.parent (None Text) + } + } + ) + +let nouxBase = + Noux.construct + ( Noux.defaults + ⫽ { config = + XML.text + '' + + + + + + + + + + + + + + + + + '' + , resources = + { caps = 512, ram = Genode.units.MiB 64 } + , routes = + { timer = Genode.Route.parent (None Text) } + } + ) + +let parentFs = + λ(label : Text) + → Genode.ServiceRoute.parent "File_system" (Some label) (Some label) + +let noux = + nouxBase + ⫽ { exitPropagate = + True + , routes = + nouxBase.routes + # [ Genode.ServiceRoute.child + "Terminal" + "terminal" + (None Text) + (None Text) + , parentFs "target" + , parentFs "config" + , parentFs "report" + ] + } + +let initConfig = + Genode.Init.defaults ⫽ { verbose = True, children = [ terminal, noux ] } in { indexInfo = "Noux administration environment" , runtime = Genode.Runtime.defaults - ⫽ { ram = - Genode.units.MiB 72 - , caps = - 1000 + ⫽ { resources = + Genode.Init.sumResources initConfig , requires = [ fsService "config" , fsService "report" @@ -42,77 +112,6 @@ in { indexInfo = , "vfs.lib.so" ] , config = - XML.text - '' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '' + Genode.Init.toXML initConfig } } diff --git a/src/nic_bus/Tupfile b/src/nic_bus/Tupfile index 285a95341..034084bd6 100644 --- a/src/nic_bus/Tupfile +++ b/src/nic_bus/Tupfile @@ -8,7 +8,7 @@ include_rules : {objs} |> !prg |> %d {binary} : {binary} |> !collect_bin |> -: ./pkg.dhall |> !render_runtime |> {runtime} +: ./pkg.dhall |> !render_runtime |> include &(BIN_RULES) include &(PKG_RULES) diff --git a/src/nic_bus/pkg.dhall b/src/nic_bus/pkg.dhall index ee10cc0c3..55a996bc7 100644 --- a/src/nic_bus/pkg.dhall +++ b/src/nic_bus/pkg.dhall @@ -7,10 +7,8 @@ let XML = Prelude.XML in { indexInfo = "Switched ethernet bus" , runtime = - { ram = - Genode.units.MiB 4 - , caps = - 96 + { resources = + { ram = Genode.units.MiB 4, caps = 96 } , binary = "nic_bus" , provides =