From 945b4760ef6dc14210388261914bdab7055b69a4 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Tue, 23 Mar 2021 13:40:05 +0100
Subject: [PATCH] sculpt: remove vfs.lib and init from common rules

to support packages using own build versions and to detect packages missing
to specify dependency on init.
---
 repos/gems/recipes/pkg/motif_wm/archives  | 1 +
 repos/gems/recipes/pkg/motif_wm/runtime   | 1 +
 repos/gems/recipes/pkg/themed_wm/archives | 1 +
 repos/gems/recipes/pkg/themed_wm/runtime  | 1 +
 repos/gems/run/sculpt.run                 | 4 +---
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/repos/gems/recipes/pkg/motif_wm/archives b/repos/gems/recipes/pkg/motif_wm/archives
index 07466c666a..b6df9bc33e 100644
--- a/repos/gems/recipes/pkg/motif_wm/archives
+++ b/repos/gems/recipes/pkg/motif_wm/archives
@@ -3,3 +3,4 @@ _/src/wm
 _/src/report_rom
 _/src/decorator
 _/src/window_layouter
+_/src/init
diff --git a/repos/gems/recipes/pkg/motif_wm/runtime b/repos/gems/recipes/pkg/motif_wm/runtime
index c16988b869..c9ad40585d 100644
--- a/repos/gems/recipes/pkg/motif_wm/runtime
+++ b/repos/gems/recipes/pkg/motif_wm/runtime
@@ -12,6 +12,7 @@
 	<provides> <gui/> <report/> <rom/> </provides>
 
 	<content>
+		<rom label="init"/>
 		<rom label="ld.lib.so"/>
 		<rom label="report_rom"/>
 		<rom label="decorator"/>
diff --git a/repos/gems/recipes/pkg/themed_wm/archives b/repos/gems/recipes/pkg/themed_wm/archives
index 73b10ef371..c10c1ba059 100644
--- a/repos/gems/recipes/pkg/themed_wm/archives
+++ b/repos/gems/recipes/pkg/themed_wm/archives
@@ -1,5 +1,6 @@
 _/pkg/motif_wm
 _/raw/themed_wm
+_/src/init
 _/src/themed_decorator
 _/src/libc
 _/src/libpng
diff --git a/repos/gems/recipes/pkg/themed_wm/runtime b/repos/gems/recipes/pkg/themed_wm/runtime
index c9f529aa95..1ae9c01079 100644
--- a/repos/gems/recipes/pkg/themed_wm/runtime
+++ b/repos/gems/recipes/pkg/themed_wm/runtime
@@ -12,6 +12,7 @@
 	<provides> <gui/> <report/> <rom/> </provides>
 
 	<content>
+		<rom label="init"/>
 		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run
index 6a1f9f1c98..7373feff20 100644
--- a/repos/gems/run/sculpt.run
+++ b/repos/gems/run/sculpt.run
@@ -584,9 +584,7 @@ append manual_deploy_config {
 <config arch="} [depot_spec] {">
 
 	<common_routes>
-		<service name="ROM" label_last="ld.lib.so">  <parent/> </service>
-		<service name="ROM" label_last="vfs.lib.so"> <parent/> </service>
-		<service name="ROM" label_last="init">       <parent/> </service>
+		<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
 		<service name="CPU">   <parent/> </service>
 		<service name="PD">    <parent/> </service>
 		<service name="LOG">   <parent/> </service>