From b6d14d9960f21d9201ddb4ed6dba27395b35587e Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Fri, 12 Apr 2019 11:46:07 +0200
Subject: [PATCH] dde_ipxe: name ipxe nic_drv unambigously

Ref #2190
---
 repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime      | 4 ++--
 repos/dde_ipxe/src/drivers/nic/target.mk             | 2 +-
 repos/gems/recipes/raw/drivers_nic-pc/drivers.config | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime b/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime
index efae10954..38d1872c7 100755
--- a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime
+++ b/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime
@@ -1,4 +1,4 @@
-<runtime ram="16M" caps="300" binary="nic_drv">
+<runtime ram="16M" caps="300" binary="ipxe_nic_drv">
 
 	<provides> <nic/> </provides>
 
@@ -6,7 +6,7 @@
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="nic_drv"/>
+		<rom label="ipxe_nic_drv"/>
 	</content>
 
 </runtime>
diff --git a/repos/dde_ipxe/src/drivers/nic/target.mk b/repos/dde_ipxe/src/drivers/nic/target.mk
index c12de8dd8..95f6bff4d 100644
--- a/repos/dde_ipxe/src/drivers/nic/target.mk
+++ b/repos/dde_ipxe/src/drivers/nic/target.mk
@@ -1,4 +1,4 @@
-TARGET   = nic_drv
+TARGET   = ipxe_nic_drv
 REQUIRES = x86
 LIBS     = base dde_ipxe_nic
 SRC_CC   = main.cc
diff --git a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config
index 077f943fe..e993e54c7 100644
--- a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config
+++ b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config
@@ -71,6 +71,7 @@
 	</start>
 
 	<start name="nic_drv">
+		<binary name="ipxe_nic_drv"/>
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="Nic"/> </provides>
 		<config/>