From 026b117a63074312865d038d5f4add3bcb627015 Mon Sep 17 00:00:00 2001
From: Johannes Schlatow <johannes.schlatow@genode-labs.com>
Date: Thu, 10 Jun 2021 14:17:15 +0200
Subject: [PATCH] separate sandbox api from os

genodelabs/genode#4191
---
 repos/gems/recipes/src/text_area/used_apis  | 1 +
 repos/gems/src/app/text_area/dialog.h       | 2 +-
 repos/gems/src/app/text_area/main.cc        | 2 +-
 repos/os/include/{os => sandbox}/sandbox.h  | 6 +++---
 repos/os/recipes/api/os/content.mk          | 2 +-
 repos/os/recipes/api/sandbox/content.mk     | 8 ++++++++
 repos/os/recipes/api/sandbox/hash           | 1 +
 repos/os/recipes/src/init/used_apis         | 1 +
 repos/os/recipes/src/sandbox/used_apis      | 1 +
 repos/os/recipes/src/test-sandbox/used_apis | 1 +
 repos/os/src/init/main.cc                   | 2 +-
 repos/os/src/lib/sandbox/child.h            | 2 +-
 repos/os/src/lib/sandbox/library.cc         | 2 +-
 repos/os/src/lib/sandbox/state_reporter.h   | 2 +-
 repos/os/src/test/sandbox/main.cc           | 2 +-
 15 files changed, 24 insertions(+), 11 deletions(-)
 rename repos/os/include/{os => sandbox}/sandbox.h (98%)
 create mode 100644 repos/os/recipes/api/sandbox/content.mk
 create mode 100644 repos/os/recipes/api/sandbox/hash

diff --git a/repos/gems/recipes/src/text_area/used_apis b/repos/gems/recipes/src/text_area/used_apis
index 89cebe3fde..817b332130 100644
--- a/repos/gems/recipes/src/text_area/used_apis
+++ b/repos/gems/recipes/src/text_area/used_apis
@@ -1,4 +1,5 @@
 base
+sandbox
 os
 vfs
 report_session
diff --git a/repos/gems/src/app/text_area/dialog.h b/repos/gems/src/app/text_area/dialog.h
index ab4ef17d9e..298b79fead 100644
--- a/repos/gems/src/app/text_area/dialog.h
+++ b/repos/gems/src/app/text_area/dialog.h
@@ -18,7 +18,7 @@
 #include <base/component.h>
 #include <base/session_object.h>
 #include <os/buffered_xml.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 #include <os/dynamic_rom_session.h>
 #include <input/event.h>
 #include <util/utf8.h>
diff --git a/repos/gems/src/app/text_area/main.cc b/repos/gems/src/app/text_area/main.cc
index 4404fd9768..5523784dd1 100644
--- a/repos/gems/src/app/text_area/main.cc
+++ b/repos/gems/src/app/text_area/main.cc
@@ -17,7 +17,7 @@
 #include <base/attached_rom_dataspace.h>
 #include <base/buffered_output.h>
 #include <os/buffered_xml.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 #include <os/dynamic_rom_session.h>
 #include <os/vfs.h>
 #include <os/reporter.h>
diff --git a/repos/os/include/os/sandbox.h b/repos/os/include/sandbox/sandbox.h
similarity index 98%
rename from repos/os/include/os/sandbox.h
rename to repos/os/include/sandbox/sandbox.h
index c7a64fe8f1..9f2b7ce60f 100644
--- a/repos/os/include/os/sandbox.h
+++ b/repos/os/include/sandbox/sandbox.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU Affero General Public License version 3.
  */
 
-#ifndef _INCLUDE__OS__SANDBOX_H_
-#define _INCLUDE__OS__SANDBOX_H_
+#ifndef _INCLUDE__SANDBOX__SANDBOX_H_
+#define _INCLUDE__SANDBOX__SANDBOX_H_
 
 #include <util/xml_node.h>
 #include <util/noncopyable.h>
@@ -276,4 +276,4 @@ struct Genode::Sandbox::Local_service : private Local_service_base
 	}
 };
 
-#endif /* _INCLUDE__OS__SANDBOX_H_ */
+#endif /* _INCLUDE__SANDBOX__SANDBOX_H_ */
diff --git a/repos/os/recipes/api/os/content.mk b/repos/os/recipes/api/os/content.mk
index 8787e7d151..ee41b4da74 100644
--- a/repos/os/recipes/api/os/content.mk
+++ b/repos/os/recipes/api/os/content.mk
@@ -1,7 +1,7 @@
 INCLUDE_SUB_DIRS := os util packet_stream_rx packet_stream_tx spec/x86_64/os \
                     spec/arm/os spec/x86_32/os spec/arm_64/os
 
-MIRRORED_FROM_REP_DIR := $(addprefix include/,$(INCLUDE_SUB_DIRS)) lib/symbols
+MIRRORED_FROM_REP_DIR := $(addprefix include/,$(INCLUDE_SUB_DIRS))
 
 content: $(MIRRORED_FROM_REP_DIR) LICENSE
 
diff --git a/repos/os/recipes/api/sandbox/content.mk b/repos/os/recipes/api/sandbox/content.mk
new file mode 100644
index 0000000000..a8c38f8185
--- /dev/null
+++ b/repos/os/recipes/api/sandbox/content.mk
@@ -0,0 +1,8 @@
+content: include/sandbox lib/symbols/sandbox LICENSE
+
+include/sandbox lib/symbols/sandbox:
+	$(mirror_from_rep_dir)
+
+LICENSE:
+	cp $(GENODE_DIR)/LICENSE $@
+
diff --git a/repos/os/recipes/api/sandbox/hash b/repos/os/recipes/api/sandbox/hash
new file mode 100644
index 0000000000..db7a6a9d84
--- /dev/null
+++ b/repos/os/recipes/api/sandbox/hash
@@ -0,0 +1 @@
+2021-06-10 c9628debcab3c3f059bde8825e1eae69692e5451
diff --git a/repos/os/recipes/src/init/used_apis b/repos/os/recipes/src/init/used_apis
index 4b236de878..8c73e3dc70 100644
--- a/repos/os/recipes/src/init/used_apis
+++ b/repos/os/recipes/src/init/used_apis
@@ -1,4 +1,5 @@
 base
+sandbox
 os
 report_session
 timer_session
diff --git a/repos/os/recipes/src/sandbox/used_apis b/repos/os/recipes/src/sandbox/used_apis
index 69a94c6d26..54b166594f 100644
--- a/repos/os/recipes/src/sandbox/used_apis
+++ b/repos/os/recipes/src/sandbox/used_apis
@@ -1,3 +1,4 @@
 base
+sandbox
 os
 report_session
diff --git a/repos/os/recipes/src/test-sandbox/used_apis b/repos/os/recipes/src/test-sandbox/used_apis
index 3a7f09b08d..799a73e578 100644
--- a/repos/os/recipes/src/test-sandbox/used_apis
+++ b/repos/os/recipes/src/test-sandbox/used_apis
@@ -1,3 +1,4 @@
 base
+sandbox
 os
 timer_session
diff --git a/repos/os/src/init/main.cc b/repos/os/src/init/main.cc
index 7b69c95721..a3fa95de0a 100644
--- a/repos/os/src/init/main.cc
+++ b/repos/os/src/init/main.cc
@@ -14,7 +14,7 @@
 /* Genode includes */
 #include <base/component.h>
 #include <base/attached_rom_dataspace.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 #include <os/reporter.h>
 
 namespace Init {
diff --git a/repos/os/src/lib/sandbox/child.h b/repos/os/src/lib/sandbox/child.h
index 2c27e4ea8a..10c7772b06 100644
--- a/repos/os/src/lib/sandbox/child.h
+++ b/repos/os/src/lib/sandbox/child.h
@@ -20,7 +20,7 @@
 #include <os/session_requester.h>
 #include <os/session_policy.h>
 #include <os/buffered_xml.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 
 /* local includes */
 #include <types.h>
diff --git a/repos/os/src/lib/sandbox/library.cc b/repos/os/src/lib/sandbox/library.cc
index 21e1245f08..90a8e556b5 100644
--- a/repos/os/src/lib/sandbox/library.cc
+++ b/repos/os/src/lib/sandbox/library.cc
@@ -13,7 +13,7 @@
 
 /* Genode includes */
 #include <base/attached_rom_dataspace.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 
 /* local includes */
 #include <child.h>
diff --git a/repos/os/src/lib/sandbox/state_reporter.h b/repos/os/src/lib/sandbox/state_reporter.h
index bc0d6d5ee1..e1602084c4 100644
--- a/repos/os/src/lib/sandbox/state_reporter.h
+++ b/repos/os/src/lib/sandbox/state_reporter.h
@@ -16,7 +16,7 @@
 
 /* Genode includes */
 #include <timer_session/connection.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 
 /* local includes */
 #include "report.h"
diff --git a/repos/os/src/test/sandbox/main.cc b/repos/os/src/test/sandbox/main.cc
index 288c28add1..54cf4906f0 100644
--- a/repos/os/src/test/sandbox/main.cc
+++ b/repos/os/src/test/sandbox/main.cc
@@ -15,7 +15,7 @@
 #include <log_session/log_session.h>
 #include <base/session_object.h>
 #include <os/buffered_xml.h>
-#include <os/sandbox.h>
+#include <sandbox/sandbox.h>
 #include <timer_session/connection.h>
 
 namespace Test {