From c7c460f6e01c358cd8d334a2790f436251123f78 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Mon, 26 Sep 2022 15:59:36 +0200
Subject: [PATCH] os: add include/pci/* to os api

Ref genodelabs/genode#4578
---
 repos/os/recipes/api/os/content.mk            | 4 ++--
 repos/os/recipes/src/pci_decode/content.mk    | 4 ----
 repos/os/recipes/src/platform_drv/content.inc | 5 +----
 repos/pc/recipes/api/pc_linux/content.mk      | 4 ----
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/repos/os/recipes/api/os/content.mk b/repos/os/recipes/api/os/content.mk
index ee41b4da74..016e20cee3 100644
--- a/repos/os/recipes/api/os/content.mk
+++ b/repos/os/recipes/api/os/content.mk
@@ -1,5 +1,5 @@
-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
+INCLUDE_SUB_DIRS := os util packet_stream_rx packet_stream_tx pci \
+                    spec/x86_64/os spec/arm/os spec/x86_32/os spec/arm_64/os
 
 MIRRORED_FROM_REP_DIR := $(addprefix include/,$(INCLUDE_SUB_DIRS))
 
diff --git a/repos/os/recipes/src/pci_decode/content.mk b/repos/os/recipes/src/pci_decode/content.mk
index 18a31b2f3e..8cc6ae3d61 100644
--- a/repos/os/recipes/src/pci_decode/content.mk
+++ b/repos/os/recipes/src/pci_decode/content.mk
@@ -1,6 +1,2 @@
 SRC_DIR = src/app/pci_decode
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
-
-content: $(GENODE_DIR)/repos/os/include/pci
-	mkdir -p include
-	cp -r $< include/
diff --git a/repos/os/recipes/src/platform_drv/content.inc b/repos/os/recipes/src/platform_drv/content.inc
index bce4ea0042..23684efa08 100644
--- a/repos/os/recipes/src/platform_drv/content.inc
+++ b/repos/os/recipes/src/platform_drv/content.inc
@@ -1,13 +1,10 @@
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
 
 GENERIC_SRC_DIR := $(GENODE_DIR)/repos/os/src/drivers/platform
-GENERIC_INC_DIR := $(GENODE_DIR)/repos/os/include/pci
 
 GENERIC_SRC_FILES := $(filter-out target.mk,$(filter-out main.cc,$(notdir $(wildcard $(GENERIC_SRC_DIR)/*.*))))
-GENERIC_HDR_FILES := $(notdir $(wildcard $(GENERIC_INC_DIR)/*.h))
 
-MIRROR_FROM_OS_DIR := $(addprefix src/drivers/platform/,$(GENERIC_SRC_FILES)) \
-                      $(addprefix include/pci/,$(GENERIC_HDR_FILES))
+MIRROR_FROM_OS_DIR := $(addprefix src/drivers/platform/,$(GENERIC_SRC_FILES))
 
 content: $(MIRROR_FROM_OS_DIR)
 
diff --git a/repos/pc/recipes/api/pc_linux/content.mk b/repos/pc/recipes/api/pc_linux/content.mk
index 690b3cc7f9..3f5fd64d3a 100644
--- a/repos/pc/recipes/api/pc_linux/content.mk
+++ b/repos/pc/recipes/api/pc_linux/content.mk
@@ -2,10 +2,6 @@
 # Content hosted in the dde_linux repository
 #
 
-content: include/pci
-include/pci:
-	mkdir -p $(dir $@); cp -r $(GENODE_DIR)/repos/os/$@ $(dir $@)
-
 MIRRORED_FROM_DDE_LINUX := src/lib/lx_emul \
                            src/lib/lx_kit \
                            src/include/lx_emul \