From c85bc38802ec65c32b7a964c9d99298b906d0ab6 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Mon, 7 Oct 2019 17:18:15 +0200
Subject: [PATCH] Move include/gems/vfs.h to include/os/vfs.h

Fixes #3515
---
 repos/gems/include/gems/vfs_font.h               | 2 +-
 repos/gems/recipes/src/depot_query/content.mk    | 2 +-
 repos/gems/recipes/src/fs_query/content.mk       | 2 --
 repos/gems/recipes/src/fs_tool/content.mk        | 2 --
 repos/gems/src/app/depot_query/main.cc           | 2 +-
 repos/gems/src/app/fs_query/main.cc              | 2 +-
 repos/gems/src/app/fs_tool/main.cc               | 2 +-
 repos/gems/src/app/menu_view/main.cc             | 2 +-
 repos/gems/src/lib/vfs/import/plugin.cc          | 2 +-
 repos/gems/src/lib/vfs/trace/vfs.cc              | 3 +--
 repos/gems/src/lib/vfs/ttf/vfs.cc                | 2 +-
 repos/gems/src/server/terminal/main.cc           | 2 +-
 repos/gems/src/test/text_painter/main.cc         | 2 +-
 repos/{gems/include/gems => os/include/os}/vfs.h | 6 +++---
 14 files changed, 14 insertions(+), 19 deletions(-)
 rename repos/{gems/include/gems => os/include/os}/vfs.h (99%)

diff --git a/repos/gems/include/gems/vfs_font.h b/repos/gems/include/gems/vfs_font.h
index b0512fea6c..d2c4716759 100644
--- a/repos/gems/include/gems/vfs_font.h
+++ b/repos/gems/include/gems/vfs_font.h
@@ -14,7 +14,7 @@
 #ifndef _INCLUDE__GEMS__VFS_FONT_T_
 #define _INCLUDE__GEMS__VFS_FONT_T_
 
-#include <gems/vfs.h>
+#include <os/vfs.h>
 #include <nitpicker_gfx/text_painter.h>
 
 namespace Genode { class Vfs_font; }
diff --git a/repos/gems/recipes/src/depot_query/content.mk b/repos/gems/recipes/src/depot_query/content.mk
index 19ba543740..60237cf4e7 100644
--- a/repos/gems/recipes/src/depot_query/content.mk
+++ b/repos/gems/recipes/src/depot_query/content.mk
@@ -2,7 +2,7 @@ SRC_DIR := src/app/depot_query
 
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
 
-MIRROR_FROM_REP_DIR := include/depot include/gems/vfs.h include/gems/lru_cache.h
+MIRROR_FROM_REP_DIR := include/depot include/gems/lru_cache.h
 
 content: $(MIRROR_FROM_REP_DIR)
 
diff --git a/repos/gems/recipes/src/fs_query/content.mk b/repos/gems/recipes/src/fs_query/content.mk
index f00e374753..2431cd7267 100644
--- a/repos/gems/recipes/src/fs_query/content.mk
+++ b/repos/gems/recipes/src/fs_query/content.mk
@@ -2,8 +2,6 @@ SRC_DIR := src/app/fs_query
 
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
 
-MIRROR_FROM_REP_DIR := include/gems/vfs.h
-
 content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
diff --git a/repos/gems/recipes/src/fs_tool/content.mk b/repos/gems/recipes/src/fs_tool/content.mk
index bc10675030..5ac42d5d74 100644
--- a/repos/gems/recipes/src/fs_tool/content.mk
+++ b/repos/gems/recipes/src/fs_tool/content.mk
@@ -2,8 +2,6 @@ SRC_DIR := src/app/fs_tool
 
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
 
-MIRROR_FROM_REP_DIR := include/gems/vfs.h
-
 content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
diff --git a/repos/gems/src/app/depot_query/main.cc b/repos/gems/src/app/depot_query/main.cc
index c983c0975a..fdedbbf260 100644
--- a/repos/gems/src/app/depot_query/main.cc
+++ b/repos/gems/src/app/depot_query/main.cc
@@ -16,7 +16,7 @@
 #include <base/heap.h>
 #include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
-#include <gems/vfs.h>
+#include <os/vfs.h>
 #include <depot/archive.h>
 #include <gems/lru_cache.h>
 
diff --git a/repos/gems/src/app/fs_query/main.cc b/repos/gems/src/app/fs_query/main.cc
index 1ad222bf99..28b93778f9 100644
--- a/repos/gems/src/app/fs_query/main.cc
+++ b/repos/gems/src/app/fs_query/main.cc
@@ -17,7 +17,7 @@
 #include <base/heap.h>
 #include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
-#include <gems/vfs.h>
+#include <os/vfs.h>
 
 namespace Fs_query {
 	using namespace Genode;
diff --git a/repos/gems/src/app/fs_tool/main.cc b/repos/gems/src/app/fs_tool/main.cc
index 54ba93c976..3b5e07b903 100644
--- a/repos/gems/src/app/fs_tool/main.cc
+++ b/repos/gems/src/app/fs_tool/main.cc
@@ -16,7 +16,7 @@
 #include <base/sleep.h>
 #include <base/attached_rom_dataspace.h>
 #include <base/heap.h>
-#include <gems/vfs.h>
+#include <os/vfs.h>
 
 namespace Fs_tool {
 	using namespace Genode;
diff --git a/repos/gems/src/app/menu_view/main.cc b/repos/gems/src/app/menu_view/main.cc
index 42b6c1cb6d..9f085d3bb4 100644
--- a/repos/gems/src/app/menu_view/main.cc
+++ b/repos/gems/src/app/menu_view/main.cc
@@ -25,10 +25,10 @@
 #include <input/event.h>
 #include <os/reporter.h>
 #include <timer_session/connection.h>
+#include <os/vfs.h>
 
 /* gems includes */
 #include <gems/nitpicker_buffer.h>
-#include <gems/vfs.h>
 
 namespace Menu_view { struct Main; }
 
diff --git a/repos/gems/src/lib/vfs/import/plugin.cc b/repos/gems/src/lib/vfs/import/plugin.cc
index e2acb94e97..2b7bb73ac2 100644
--- a/repos/gems/src/lib/vfs/import/plugin.cc
+++ b/repos/gems/src/lib/vfs/import/plugin.cc
@@ -11,7 +11,7 @@
  * under the terms of the GNU Affero General Public License version 3.
  */
 
-#include <gems/vfs.h>
+#include <os/vfs.h>
 #include <vfs/print.h>
 #include <base/heap.h>
 
diff --git a/repos/gems/src/lib/vfs/trace/vfs.cc b/repos/gems/src/lib/vfs/trace/vfs.cc
index 7629049c69..6dcc7ac260 100644
--- a/repos/gems/src/lib/vfs/trace/vfs.cc
+++ b/repos/gems/src/lib/vfs/trace/vfs.cc
@@ -15,8 +15,7 @@
 #include <vfs/dir_file_system.h>
 #include <vfs/single_file_system.h>
 
-
-#include <gems/vfs.h>
+#include <os/vfs.h>
 #include <util/xml_generator.h>
 
 #include <trace_session/connection.h>
diff --git a/repos/gems/src/lib/vfs/ttf/vfs.cc b/repos/gems/src/lib/vfs/ttf/vfs.cc
index e1ec7a3903..8913eac71a 100644
--- a/repos/gems/src/lib/vfs/ttf/vfs.cc
+++ b/repos/gems/src/lib/vfs/ttf/vfs.cc
@@ -14,10 +14,10 @@
 /* Genode includes */
 #include <vfs/dir_file_system.h>
 #include <vfs/readonly_value_file_system.h>
+#include <os/vfs.h>
 
 /* gems includes */
 #include <gems/ttf_font.h>
-#include <gems/vfs.h>
 #include <gems/cached_font.h>
 
 /* local includes */
diff --git a/repos/gems/src/server/terminal/main.cc b/repos/gems/src/server/terminal/main.cc
index d0d8c0e947..c169d22c9a 100644
--- a/repos/gems/src/server/terminal/main.cc
+++ b/repos/gems/src/server/terminal/main.cc
@@ -22,7 +22,7 @@
 #include <base/attached_ram_dataspace.h>
 #include <input/event.h>
 #include <os/reporter.h>
-#include <gems/vfs.h>
+#include <os/vfs.h>
 #include <gems/vfs_font.h>
 #include <gems/cached_font.h>
 
diff --git a/repos/gems/src/test/text_painter/main.cc b/repos/gems/src/test/text_painter/main.cc
index 1e39eeaaae..1a2326653d 100644
--- a/repos/gems/src/test/text_painter/main.cc
+++ b/repos/gems/src/test/text_painter/main.cc
@@ -23,10 +23,10 @@
 #include <nitpicker_gfx/box_painter.h>
 #include <util/bezier.h>
 #include <timer_session/connection.h>
+#include <os/vfs.h>
 
 /* gems includes */
 #include <gems/ttf_font.h>
-#include <gems/vfs.h>
 #include <gems/vfs_font.h>
 #include <gems/cached_font.h>
 
diff --git a/repos/gems/include/gems/vfs.h b/repos/os/include/os/vfs.h
similarity index 99%
rename from repos/gems/include/gems/vfs.h
rename to repos/os/include/os/vfs.h
index 952c98aa4c..5070f68e49 100644
--- a/repos/gems/include/gems/vfs.h
+++ b/repos/os/include/os/vfs.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU Affero General Public License version 3.
  */
 
-#ifndef _INCLUDE__GEMS__VFS_H_
-#define _INCLUDE__GEMS__VFS_H_
+#ifndef _INCLUDE__OS__VFS_H_
+#define _INCLUDE__OS__VFS_H_
 
 /* Genode includes */
 #include <base/env.h>
@@ -619,4 +619,4 @@ class Genode::Watch_handler : public Vfs::Watch_response_handler,
 		void watch_response() override { (_obj.*_member)(); }
 };
 
-#endif /* _INCLUDE__GEMS__VFS_H_ */
+#endif /* _INCLUDE__OS__VFS_H_ */