From 8ebc185cafaf7a133404186a28d5d347fe17f543 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 5 Oct 2021 14:09:39 +0200
Subject: [PATCH] depot: merge rtc_drv into system_clock runtime pkg

This new version of the system_clock pkg does no longer depend on the
presence of an external 'Rtc' service as previously provided by the
Sculpt base system. Instead, it hosts the rtc_drv inside the subsystem.
Because rtc_drv is board-dependent, the system_clock pkg is named
system_clock-pc now.

Issue #4281
---
 .../{system_clock => system_clock-pc}/README  |  0
 .../recipes/pkg/system_clock-pc/archives      |  3 ++
 .../{system_clock => system_clock-pc}/hash    |  0
 .../recipes/pkg/system_clock-pc/runtime       | 54 +++++++++++++++++++
 .../recipes/pkg/system_clock/archives         |  1 -
 .../libports/recipes/pkg/system_clock/runtime | 19 -------
 6 files changed, 57 insertions(+), 20 deletions(-)
 rename repos/libports/recipes/pkg/{system_clock => system_clock-pc}/README (100%)
 create mode 100644 repos/libports/recipes/pkg/system_clock-pc/archives
 rename repos/libports/recipes/pkg/{system_clock => system_clock-pc}/hash (100%)
 create mode 100644 repos/libports/recipes/pkg/system_clock-pc/runtime
 delete mode 100644 repos/libports/recipes/pkg/system_clock/archives
 delete mode 100644 repos/libports/recipes/pkg/system_clock/runtime

diff --git a/repos/libports/recipes/pkg/system_clock/README b/repos/libports/recipes/pkg/system_clock-pc/README
similarity index 100%
rename from repos/libports/recipes/pkg/system_clock/README
rename to repos/libports/recipes/pkg/system_clock-pc/README
diff --git a/repos/libports/recipes/pkg/system_clock-pc/archives b/repos/libports/recipes/pkg/system_clock-pc/archives
new file mode 100644
index 0000000000..9284eccce8
--- /dev/null
+++ b/repos/libports/recipes/pkg/system_clock-pc/archives
@@ -0,0 +1,3 @@
+_/src/system_rtc
+_/src/rtc_drv
+_/src/init
diff --git a/repos/libports/recipes/pkg/system_clock/hash b/repos/libports/recipes/pkg/system_clock-pc/hash
similarity index 100%
rename from repos/libports/recipes/pkg/system_clock/hash
rename to repos/libports/recipes/pkg/system_clock-pc/hash
diff --git a/repos/libports/recipes/pkg/system_clock-pc/runtime b/repos/libports/recipes/pkg/system_clock-pc/runtime
new file mode 100644
index 0000000000..41bccd5405
--- /dev/null
+++ b/repos/libports/recipes/pkg/system_clock-pc/runtime
@@ -0,0 +1,54 @@
+<runtime ram="4M" caps="300" binary="init">
+
+	<provides> <rtc/> </provides>
+
+	<requires> <timer/> <irq/> <io_port/> </requires>
+
+	<content>
+		<rom label="ld.lib.so"/>
+		<rom label="init"/>
+		<rom label="rtc_drv"/>
+		<rom label="system_rtc"/>
+	</content>
+
+	<config>
+
+		<parent-provides>
+			<service name="ROM"/>
+			<service name="IRQ"/>
+			<service name="IO_MEM"/>
+			<service name="IO_PORT"/>
+			<service name="PD"/>
+			<service name="RM"/>
+			<service name="CPU"/>
+			<service name="LOG"/>
+			<service name="Timer"/>
+		</parent-provides>
+
+		<default caps="100"/>
+
+		<service name="Rtc">
+			<default-policy> <child name="system_rtc"/> </default-policy> </service>
+
+		<start name="rtc_drv">
+			<resource name="RAM" quantum="1M"/>
+			<provides> <service name="Rtc"/> </provides>
+			<config/>
+			<route>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+
+		<start name="system_rtc">
+			<resource name="RAM" quantum="1M"/>
+			<provides> <service name="Rtc"/> </provides>
+			<config/>
+			<route>
+				<service name="Rtc"> <child name="rtc_drv"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+
+	</config>
+
+</runtime>
diff --git a/repos/libports/recipes/pkg/system_clock/archives b/repos/libports/recipes/pkg/system_clock/archives
deleted file mode 100644
index fa76828109..0000000000
--- a/repos/libports/recipes/pkg/system_clock/archives
+++ /dev/null
@@ -1 +0,0 @@
-_/src/system_rtc
diff --git a/repos/libports/recipes/pkg/system_clock/runtime b/repos/libports/recipes/pkg/system_clock/runtime
deleted file mode 100644
index 128c72d295..0000000000
--- a/repos/libports/recipes/pkg/system_clock/runtime
+++ /dev/null
@@ -1,19 +0,0 @@
-<runtime ram="3M" caps="100" binary="system_rtc">
-
-	<provides>
-		<rtc/>
-	</provides>
-
-	<requires>
-		<rtc/>
-		<timer/>
-	</requires>
-
-	<content>
-		<rom label="ld.lib.so"/>
-		<rom label="system_rtc"/>
-	</content>
-
-	<config allow_setting_rtc="false"/>
-
-</runtime>