2
0
Fork 0

genodeSources: increase size limit of loader ROM labels

This commit is contained in:
Emery Hemingway 2020-05-18 20:16:04 +05:30
parent c882d0c0e8
commit 56bdd97655
2 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,58 @@
commit 5f850f8b3f7261aeaf0dfea8fcb190539677154c
Author: Emery Hemingway <ehmry@posteo.net>
Date: Sun May 17 00:28:28 2020 +0530
base: increase binary name limit to 160 bytes
diff --git a/repos/base/include/base/child.h b/repos/base/include/base/child.h
index 8c7b33a9d9..6b6d0ca6bc 100644
--- a/repos/base/include/base/child.h
+++ b/repos/base/include/base/child.h
@@ -44,9 +44,9 @@ namespace Genode {
*/
struct Genode::Child_policy
{
- typedef String<64> Name;
- typedef String<64> Binary_name;
- typedef String<64> Linker_name;
+ typedef String<160> Name;
+ typedef String<160> Binary_name;
+ typedef String<160> Linker_name;
virtual ~Child_policy() { }
@@ -407,7 +407,7 @@ class Genode::Child : protected Rpc_object<Parent>,
Id_space<Parent::Client>::Id const _client_id;
- typedef String<64> Label;
+ typedef String<160> Label;
Args const _args;
diff --git a/repos/base/include/base/shared_object.h b/repos/base/include/base/shared_object.h
index f4dd1622fe..8f328cec31 100644
--- a/repos/base/include/base/shared_object.h
+++ b/repos/base/include/base/shared_object.h
@@ -128,7 +128,7 @@ class Genode::Dynamic_linker
struct Object_info
{
/* name of shared library, or "binary" for the main program */
- typedef String<64> Name;
+ typedef String<160> Name;
Name name;
Rom_dataspace_capability ds_cap;
diff --git a/repos/os/src/lib/sandbox/child.h b/repos/os/src/lib/sandbox/child.h
index 4dd2803417..c307a86afc 100644
--- a/repos/os/src/lib/sandbox/child.h
+++ b/repos/os/src/lib/sandbox/child.h
@@ -119,7 +119,7 @@ class Sandbox::Child : Child_policy, Routed_service::Wakeup
throw Missing_name_attribute();
}
- typedef String<64> Name;
+ typedef Child_policy::Name Name;
Name const _unique_name { _name_from_xml(_start_node->xml()) };
static Binary_name _binary_from_xml(Xml_node start_node,

View File

@ -26,7 +26,7 @@ let
hash = "sha256-ZY9ND6vDA9u127TAv87uOjPuLzRzBPyp5PzD6iM7uNI=";
};
nativeBuildInputs = [ expect gnumake tcl ];
patches = [ ./LIB.patch ];
patches = [ ./LIB.patch ./binary-limit.patch ];
configurePhase = ''
patchShebangs ./tool
substituteInPlace repos/base/etc/tools.conf \