ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Bump dhall-genode 

• update dhall-genode revision
• render top-level init config with lib.renderDhallInit
• convert Init.Start.config to optionals
• lib.validate renderDhallInit XML
This commit is contained in:
Ehmry - 2019-11-10 15:29:32 +01:00
parent 20594a9962
commit ef9f76744f
6 changed files with 119 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dhall/genode.nix
View File

@ -6,6 +6,6 @@
fetchgit { fetchgit {
url = "https://git.sr.ht/~ehmry/dhall-genode"; url = "https://git.sr.ht/~ehmry/dhall-genode";
rev = "4e05e7bf88e53c81a8f00460673fd48e858c6dfc"; rev = "c9a9c18dc8dd45198dbf0a53732ca02079fee0fd";
sha256 = "0y92jinqr26wlrychk8mi58kqwmy4y25c2ffks3r3m78i8andi8y"; sha256 = "1fcfyfcnm6snpagf3ii70p8vdy7na9lv6c3izlckyp6gvgadyyjn";
} }

5
lib/default.nix
View File

@ -24,7 +24,7 @@ in {
renderDhallInit = path: args: renderDhallInit = path: args:
hostPkgs.runCommand "init.xml" { hostPkgs.runCommand "init.xml" {
preferLocalBuild = true; preferLocalBuild = true;
buildInputs = [ hostPkgs.dhall ]; buildInputs = with hostPkgs; [ dhall libxml2 ];
initConfig = path; initConfig = path;
initArgs = args; initArgs = args;
DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall"; DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall";
@ -32,8 +32,9 @@ in {
} '' } ''
export XDG_CACHE_HOME=$NIX_BUILD_TOP export XDG_CACHE_HOME=$NIX_BUILD_TOP
dhall text \ dhall text \
<<< 'let Prelude = env:DHALL_GENODE in Prelude.Init.render (Prelude.Init::{ children = toMap (env:initConfig env:initArgs) })' \ <<< 'let Prelude = env:DHALL_GENODE in Prelude.Init.render (env:initConfig env:initArgs)' \
> $out > $out
xmllint --noout $out
''; '';
x86_64-genode.buildNovaIso = { name, rom }: x86_64-genode.buildNovaIso = { name, rom }:

15
tests/libc.dhall
View File

@ -1,13 +1,20 @@
let Genode = env:DHALL_GENODE let Genode = env:DHALL_GENODE
in λ(_ : {}) in λ ( _
→ { test-libc = : {}
)
→ Genode.Init::{
, verbose = True
, children =
toMap
{ test-libc =
Genode.Init.Start::{ Genode.Init.Start::{
, binary = "test-libc" , binary = "test-libc"
, resources = { caps = 200, ram = Genode.units.MiB 400 } , resources = { caps = 200, ram = Genode.units.MiB 400 }
, routes = [ Genode.ServiceRoute.parent "Timer" ] , routes = [ Genode.ServiceRoute.parent "Timer" ]
, config = , config =
Genode.Prelude.XML.text Some
( Genode.Prelude.XML.text
'' ''
<config> <config>
<vfs> <vfs>
@ -19,6 +26,8 @@ in λ(_ : {})
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
</config> </config>
'' ''
)
} }
: Genode.Init.Start.Type : Genode.Init.Start.Type
} }
}

7
tests/log.dhall
View File

@ -1,3 +1,8 @@
let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall
in λ(_ : {}) → { test-log = Genode.Init.Start::{ binary = "test-log" } } in λ(_ : {})
→ Genode.Init::{
, verbose = True
, children =
toMap { test-log = Genode.Init.Start::{ binary = "test-log" } }
}

18
tests/pci.dhall
View File

@ -3,11 +3,16 @@ let Genode = env:DHALL_GENODE
in λ ( _ in λ ( _
: {} : {}
) )
→ { test-pci = → Genode.Init::{
, verbose = True
, children =
toMap
{ test-pci =
Genode.Init.Start::{ Genode.Init.Start::{
, binary = "test-pci" , binary = "test-pci"
, resources = { caps = 96, ram = Genode.units.MiB 2 } , resources = { caps = 96, ram = Genode.units.MiB 2 }
, routes = [ Genode.ServiceRoute.child "Platform" "platform_drv" ] , routes =
[ Genode.ServiceRoute.child "Platform" "platform_drv" ]
} }
, acpi_report_rom = , acpi_report_rom =
Genode.Init.Start::{ Genode.Init.Start::{
@ -15,13 +20,15 @@ in λ ( _
, resources = { caps = 96, ram = Genode.units.MiB 2 } , resources = { caps = 96, ram = Genode.units.MiB 2 }
, provides = [ "ROM", "Report" ] , provides = [ "ROM", "Report" ]
, config = , config =
Genode.Prelude.XML.text Some
( Genode.Prelude.XML.text
'' ''
<config system="yes"> <config system="yes">
<policy label="smbios_decoder -> smbios_table" report="acpi_drv -> smbios_table"/> <policy label="smbios_decoder -> smbios_table" report="acpi_drv -> smbios_table"/>
<policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/> <policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/>
</config> </config>
'' ''
)
} }
, acpi_drv = , acpi_drv =
Genode.Init.Start::{ Genode.Init.Start::{
@ -54,11 +61,14 @@ in λ ( _
(None Text) (None Text)
] ]
, config = , config =
Genode.Prelude.XML.text Some
( Genode.Prelude.XML.text
'' ''
<config> <config>
<policy label_prefix="test-pci"> <pci class="ALL"/> </policy> <policy label_prefix="test-pci"> <pci class="ALL"/> </policy>
</config> </config>
'' ''
)
}
} }
} }

7
tests/signal.dhall
View File

@ -1,7 +1,11 @@
let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall
in λ(_ : {}) in λ(_ : {})
→ { test-signal = → Genode.Init::{
, verbose = True
, children =
toMap
{ test-signal =
Genode.Init.Start::{ Genode.Init.Start::{
, binary = "test-signal" , binary = "test-signal"
, resources = { caps = 500, ram = Genode.units.MiB 10 } , resources = { caps = 500, ram = Genode.units.MiB 10 }
@ -9,3 +13,4 @@ in λ(_ : {})
} }
: Genode.Init.Start.Type : Genode.Init.Start.Type
} }
}