From 7bb8e332a9d6f9cf9a1639b2600b716ba42b6c22 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Wed, 31 May 2017 10:20:59 +0200
Subject: [PATCH] depot: adjust base recipe to removed headers

This patch updates the recipes for the base-<kernel> archives to the
recently removed os/config.h and os/timeout.h headers.
---
 repos/base/recipes/api/base/content.mk        | 14 +++++++++++++-
 repos/base/recipes/src/base_content.inc       |  8 ++++----
 repos/os/recipes/api/timer_session/content.mk |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/repos/base/recipes/api/base/content.mk b/repos/base/recipes/api/base/content.mk
index 434ea7f7a..3a2a3603d 100644
--- a/repos/base/recipes/api/base/content.mk
+++ b/repos/base/recipes/api/base/content.mk
@@ -1,7 +1,19 @@
 content: include mk/spec lib LICENSE
 
+# architectures, for which a 'trace/timestamp.h' header is available
+ARCHS := riscv arm_v6 arm_v7 x86_32 x86_64
+
+MIRRORED_FROM_OS := $(foreach A,$(ARCHS),include/spec/$A/trace/timestamp.h)
+
 include:
-	cp -r $(REP_DIR)/include $@
+	mkdir -p include
+	cp -r $(REP_DIR)/include/* $@/
+
+content: $(MIRRORED_FROM_OS)
+
+$(MIRRORED_FROM_OS):
+	mkdir -p $(dir $@)
+	cp $(GENODE_DIR)/repos/os/$@ $@
 
 LIB_MK_FILES := base.mk ld.mk ldso-startup.mk
 
diff --git a/repos/base/recipes/src/base_content.inc b/repos/base/recipes/src/base_content.inc
index 551af5ea4..455c015e3 100644
--- a/repos/base/recipes/src/base_content.inc
+++ b/repos/base/recipes/src/base_content.inc
@@ -17,10 +17,10 @@ content: etc/specs.conf
 etc/specs.conf:
 	$(mirror_from_rep_dir)
 
-MIRRORED_FROM_OS := $(addprefix lib/mk/,timeout.mk alarm.mk config.mk timed_semaphore.mk)\
-                    $(addprefix src/lib/,timeout alarm config timed_semaphore) \
-                    $(addprefix include/os/,timeout.h alarm.h config.h timed_semaphore.h \
-                                            time_source.h) \
+MIRRORED_FROM_OS := $(addprefix lib/mk/,timeout.mk alarm.mk timed_semaphore.mk)\
+                    $(addprefix src/lib/,timeout alarm timed_semaphore) \
+                    $(addprefix include/os/,alarm.h duration.h timed_semaphore.h) \
+                    include/timer/timeout.h \
                     include/timer_session
 
 content: $(MIRRORED_FROM_OS)
diff --git a/repos/os/recipes/api/timer_session/content.mk b/repos/os/recipes/api/timer_session/content.mk
index aec2326c4..8b4f9920e 100644
--- a/repos/os/recipes/api/timer_session/content.mk
+++ b/repos/os/recipes/api/timer_session/content.mk
@@ -1,2 +1,2 @@
-MIRRORED_FROM_REP_DIR := include/timer_session
+MIRRORED_FROM_REP_DIR := include/timer_session include/timer
 include $(REP_DIR)/recipes/api/session.inc