From b541a0d448aa2ee00588f5ba5296dfe1eb31821b Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Mon, 4 Nov 2019 12:40:39 +0100
Subject: [PATCH] smbios.h: move to os/include/smbios

Fixes #3489
---
 repos/os/include/{os => smbios}/smbios.h           | 0
 repos/os/recipes/src/acpi_drv/content.mk           | 4 ++++
 repos/os/src/app/smbios_decoder/main.cc            | 2 +-
 repos/os/src/drivers/acpi/smbios_table_reporter.cc | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 rename repos/os/include/{os => smbios}/smbios.h (100%)

diff --git a/repos/os/include/os/smbios.h b/repos/os/include/smbios/smbios.h
similarity index 100%
rename from repos/os/include/os/smbios.h
rename to repos/os/include/smbios/smbios.h
diff --git a/repos/os/recipes/src/acpi_drv/content.mk b/repos/os/recipes/src/acpi_drv/content.mk
index ef2d6490a..f162d436d 100644
--- a/repos/os/recipes/src/acpi_drv/content.mk
+++ b/repos/os/recipes/src/acpi_drv/content.mk
@@ -1,2 +1,6 @@
 SRC_DIR = src/drivers/acpi
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
+
+content: $(GENODE_DIR)/repos/os/include/smbios
+	mkdir -p include
+	cp -r $< include/smbios
diff --git a/repos/os/src/app/smbios_decoder/main.cc b/repos/os/src/app/smbios_decoder/main.cc
index 795d8d4c3..00d252ce0 100644
--- a/repos/os/src/app/smbios_decoder/main.cc
+++ b/repos/os/src/app/smbios_decoder/main.cc
@@ -13,7 +13,7 @@
  */
 
 /* Genode includes */
-#include <os/smbios.h>
+#include <smbios/smbios.h>
 #include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
 #include <base/component.h>
diff --git a/repos/os/src/drivers/acpi/smbios_table_reporter.cc b/repos/os/src/drivers/acpi/smbios_table_reporter.cc
index f2be91667..74d697808 100644
--- a/repos/os/src/drivers/acpi/smbios_table_reporter.cc
+++ b/repos/os/src/drivers/acpi/smbios_table_reporter.cc
@@ -18,7 +18,7 @@
 /* Genode includes */
 #include <base/attached_io_mem_dataspace.h>
 #include <base/attached_rom_dataspace.h>
-#include <os/smbios.h>
+#include <smbios/smbios.h>
 #include <util/fifo.h>
 
 using namespace Genode;