From 940a1912fa2bb10637dc95dbf6dc35b6f1ae9f1b Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 30 May 2024 15:39:38 +0200
Subject: [PATCH] os: replace pkg/pc_nic by pkg/nic_uplink

This enables the combination of the nic_uplink component with any driver
pkg featuring a runtime file. This is already the case of the pc_nic
driver.

This is a preparatory step for issue #4420.
---
 repos/os/recipes/pkg/nic_uplink/README        |  2 +
 repos/os/recipes/pkg/nic_uplink/archives      |  1 +
 .../recipes/pkg/{pc_nic => nic_uplink}/hash   |  0
 repos/os/recipes/pkg/nic_uplink/runtime       | 14 ++++
 repos/os/recipes/pkg/pc_nic/README            |  2 -
 repos/os/recipes/pkg/pc_nic/archives          |  3 -
 repos/os/recipes/pkg/pc_nic/runtime           | 66 -------------------
 7 files changed, 17 insertions(+), 71 deletions(-)
 create mode 100644 repos/os/recipes/pkg/nic_uplink/README
 create mode 100644 repos/os/recipes/pkg/nic_uplink/archives
 rename repos/os/recipes/pkg/{pc_nic => nic_uplink}/hash (100%)
 create mode 100644 repos/os/recipes/pkg/nic_uplink/runtime
 delete mode 100644 repos/os/recipes/pkg/pc_nic/README
 delete mode 100644 repos/os/recipes/pkg/pc_nic/archives
 delete mode 100644 repos/os/recipes/pkg/pc_nic/runtime

diff --git a/repos/os/recipes/pkg/nic_uplink/README b/repos/os/recipes/pkg/nic_uplink/README
new file mode 100644
index 0000000000..ff40c5d389
--- /dev/null
+++ b/repos/os/recipes/pkg/nic_uplink/README
@@ -0,0 +1,2 @@
+
+       Component for bridging an uplink client with a NIC client
diff --git a/repos/os/recipes/pkg/nic_uplink/archives b/repos/os/recipes/pkg/nic_uplink/archives
new file mode 100644
index 0000000000..931ed3180a
--- /dev/null
+++ b/repos/os/recipes/pkg/nic_uplink/archives
@@ -0,0 +1 @@
+_/src/nic_uplink
diff --git a/repos/os/recipes/pkg/pc_nic/hash b/repos/os/recipes/pkg/nic_uplink/hash
similarity index 100%
rename from repos/os/recipes/pkg/pc_nic/hash
rename to repos/os/recipes/pkg/nic_uplink/hash
diff --git a/repos/os/recipes/pkg/nic_uplink/runtime b/repos/os/recipes/pkg/nic_uplink/runtime
new file mode 100644
index 0000000000..a62029bbdc
--- /dev/null
+++ b/repos/os/recipes/pkg/nic_uplink/runtime
@@ -0,0 +1,14 @@
+<runtime ram="1M" caps="100" binary="nic_uplink">
+
+	<requires> <timer/> </requires>
+
+	<provides> <nic/> <uplink/> </provides>
+
+	<content>
+		<rom label="ld.lib.so"/>
+		<rom label="nic_uplink"/>
+	</content>
+
+	<config/>
+
+</runtime>
diff --git a/repos/os/recipes/pkg/pc_nic/README b/repos/os/recipes/pkg/pc_nic/README
deleted file mode 100644
index a591b739d2..0000000000
--- a/repos/os/recipes/pkg/pc_nic/README
+++ /dev/null
@@ -1,2 +0,0 @@
-
-       Runtime for using the PC NIC driver with the NIC Uplink adapter
diff --git a/repos/os/recipes/pkg/pc_nic/archives b/repos/os/recipes/pkg/pc_nic/archives
deleted file mode 100644
index 973c9f3f39..0000000000
--- a/repos/os/recipes/pkg/pc_nic/archives
+++ /dev/null
@@ -1,3 +0,0 @@
-_/src/nic_uplink
-_/src/pc_nic_drv
-_/src/init
diff --git a/repos/os/recipes/pkg/pc_nic/runtime b/repos/os/recipes/pkg/pc_nic/runtime
deleted file mode 100644
index 33d2326d23..0000000000
--- a/repos/os/recipes/pkg/pc_nic/runtime
+++ /dev/null
@@ -1,66 +0,0 @@
-<runtime ram="25M" caps="600" binary="init">
-
-	<requires> <timer/> <platform/> </requires>
-
-	<provides> <nic/> </provides>
-
-	<content>
-		<rom label="ld.lib.so"/>
-		<rom label="nic_uplink"/>
-		<rom label="pc_nic_drv"/>
-		<rom label="init"/>
-	</content>
-
-	<config>
-
-		<parent-provides>
-			<service name="ROM"/>
-			<service name="PD"/>
-			<service name="RM"/>
-			<service name="CPU"/>
-			<service name="LOG"/>
-			<service name="Timer"/>
-			<service name="Platform"/>
-		</parent-provides>
-
-		<service name="Nic">
-			<default-policy> <child name="nic_uplink"/> </default-policy>
-		</service>
-
-		<start name="nic_uplink" caps="100">
-			<resource name="RAM" quantum="1M"/>
-			<provides>
-				<service name="Uplink"/>
-				<service name="Nic"/>
-			</provides>
-			<config/>
-			<route>
-				<service name="Timer"> <parent/> </service>
-				<service name="PD"> <parent/> </service>
-				<service name="ROM"> <parent/> </service>
-				<service name="LOG"> <parent/> </service>
-				<service name="CPU"> <parent/> </service>
-			</route>
-		</start>
-
-		<start name="nic_drv" caps="300">
-			<binary name="pc_nic_drv"/>
-			<resource name="RAM" quantum="20M"/>
-			<resource name="CPU" quantum="10"/>
-			<config/>
-			<route>
-				<service name="Uplink"> <child name="nic_uplink"/> </service>
-				<service name="ROM"> <parent/> </service>
-				<service name="PD"> <parent/> </service>
-				<service name="RM"> <parent/> </service>
-				<service name="CPU"> <parent/> </service>
-				<service name="LOG"> <parent/> </service>
-				<service name="Timer"> <parent/> </service>
-				<service name="Platform"> <parent label="nic"/> </service>
-			</route>
-			<config> <report mac_address="yes"/> </config>
-		</start>
-
-	</config>
-
-</runtime>