Fix Solo5 library
The solo5.lib.so library must be stripped to be compatible with ld.lib.so.
This commit is contained in:
parent
33d11182e3
commit
4fa63f845d
|
@ -43,8 +43,6 @@ in stdenv.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Sandboxed execution environment.";
|
||||
homepage = "https://github.com/solo5/solo5";
|
||||
|
|
|
@ -5,7 +5,7 @@ with pkgs;
|
|||
|
||||
let
|
||||
defaultScript = ''
|
||||
run_genode_until {child "solo5" exited with exit value 0} 30
|
||||
run_genode_until {SUCCESS} 30
|
||||
'';
|
||||
|
||||
mkTest' = { name, testConfig, testScript ? defaultScript, ... }@attrs:
|
||||
|
|
|
@ -36,7 +36,7 @@ in { config =
|
|||
, solo5 =
|
||||
Genode.Init.Start::{
|
||||
, binary = "solo5-test_net_2if"
|
||||
, resources = { caps = 256, ram = Genode.units.MiB 4 }
|
||||
, resources = { caps = 256, ram = Genode.units.MiB 5 }
|
||||
, routes =
|
||||
[ Genode.ServiceRoute.parent "Timer"
|
||||
, Genode.ServiceRoute.child "Nic" "bridge"
|
||||
|
|
|
@ -15,12 +15,22 @@ in λ(testBinary : Genode.Prelude.Map.Entry Text Text)
|
|||
, routes = [ Genode.ServiceRoute.parent "Timer" ]
|
||||
, config =
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config>
|
||||
<cmdline>Hello_Solo5</cmdline>
|
||||
</config>
|
||||
''
|
||||
( Genode.Prelude.XML.element
|
||||
{ name = "config"
|
||||
, attributes =
|
||||
[] : Genode.Prelude.Map.Type Text Text
|
||||
, content =
|
||||
[ Genode.Prelude.XML.element
|
||||
{ name = "cmdline"
|
||||
, attributes =
|
||||
[] : Genode.Prelude.Map.Type Text Text
|
||||
, content =
|
||||
[ Genode.Prelude.XML.text
|
||||
"Hello_Solo5"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,5 +29,5 @@ in { config =
|
|||
}
|
||||
}
|
||||
}
|
||||
, rom = [ test os.bin.rtc_drv ]
|
||||
, rom = [ test, os.bin.rtc_drv ]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue