From 31567c8e464fcb79a10bb242436d2caf72718a71 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 5 Oct 2021 13:42:53 +0200
Subject: [PATCH] sculpt: curate default index / installation

- CPU-architecture annotations
- Change order of top-level menu, moving Mesa driver to the end
- Add black_hole, recall_fs, file_fault
- Add usb_webcam, test-capture
- Add audio driver and mixer
- Add vbox6, keeping vbox5-nova-sculpt as fallback
- Remove recall_fs launcher, which is obsolete with the recall_fs pkg
- Replace system_clock by system_clock-pc pkg

Issue #4281
---
 .../recipes/pkg/sculpt-installation/archives  | 13 +++++--
 repos/gems/run/sculpt/index                   | 38 ++++++++++++-------
 repos/gems/run/sculpt/launcher/recall_fs      |  6 ---
 repos/os/recipes/pkg/test-capture/runtime     |  2 +-
 4 files changed, 35 insertions(+), 24 deletions(-)
 delete mode 100644 repos/gems/run/sculpt/launcher/recall_fs

diff --git a/repos/gems/recipes/pkg/sculpt-installation/archives b/repos/gems/recipes/pkg/sculpt-installation/archives
index 511fa7a6cb..419e019776 100644
--- a/repos/gems/recipes/pkg/sculpt-installation/archives
+++ b/repos/gems/recipes/pkg/sculpt-installation/archives
@@ -2,13 +2,15 @@ _/pkg/system_shell
 _/pkg/wifi
 _/pkg/ipxe_nic_drv
 _/pkg/chroot
+_/pkg/recall_fs
+_/pkg/black_hole
 _/pkg/nit_focus
 _/pkg/rom_filter
 _/pkg/rom_reporter
 _/pkg/nic_router-nat
+_/pkg/vbox6
+_/pkg/vbox6-capture
 _/pkg/vbox5-nova-sculpt
-_/pkg/vbox5
-_/pkg/vbox5-nova-capture
 _/pkg/wm
 _/pkg/themed_wm
 _/pkg/themed_decorator
@@ -21,6 +23,11 @@ _/pkg/fonts_fs
 _/pkg/report_dump
 _/pkg/acpica
 _/pkg/qt5_textedit
-_/pkg/system_clock
+_/pkg/system_clock-pc
 _/pkg/mesa_gpu-cpu
 _/pkg/mesa_gpu-intel
+_/pkg/usb_webcam
+_/pkg/file_vault
+_/pkg/test-capture
+_/pkg/bsd_audio_drv
+_/pkg/mixer
diff --git a/repos/gems/run/sculpt/index b/repos/gems/run/sculpt/index
index b00c3b11a6..f4b3b057fc 100644
--- a/repos/gems/run/sculpt/index
+++ b/repos/gems/run/sculpt/index
@@ -1,5 +1,8 @@
 <index>
 
+  <supports arch="x86_64"/>
+  <supports arch="arm_v8a"/>
+
   <index name="GUI">
     <pkg path="sticks_blue_backdrop" info="default desktop background"/>
     <pkg path="themed_wm"            info="ready-to-use window manager"/>
@@ -10,27 +13,34 @@
     <pkg path="window_layouter"      info="default window layouter"/>
   </index>
 
-  <index name="Mesa 3D">
-    <pkg path="mesa_gpu-cpu"   info="SWRAST Mesa driver"/>
-    <pkg path="mesa_gpu-intel" info="Intel IRIS Mesa driver"/>
-  </index>
-
   <index name="Tools">
-    <pkg path="system_shell" info="command-line interface to the system"/>
-    <pkg path="system_clock" info="system-clock service"/>
-    <pkg path="qt5_textedit" info="Qt5-based text editor"/>
-    <pkg path="report_dump"  info="save periodic snapshots of the report fs"/>
+    <pkg path="system_shell"    info="command-line interface to the system"/>
+    <pkg path="system_clock-pc" info="real-time-clock service" arch="x86_64"/>
+    <pkg path="qt5_textedit"    info="Qt5-based text editor"/>
+    <pkg path="report_dump"     info="save periodic snapshots of the report fs"/>
+    <pkg path="recall_fs"       info="component-specific file-system view"/>
+    <pkg path="file_vault"      info="encrypted file store"/>
+    <pkg path="black_hole"      info="pseudo service provider"/>
+    <pkg path="usb_webcam"      info="USB webcam"/>
+    <pkg path="bsd_audio_drv"   info="audio driver" arch="x86_64"/>
+    <pkg path="mixer"           info="audio mixer"/>
   </index>
 
   <index name="Demos">
-    <pkg path="nano3d"     info="simple software-rendering demo"/>
-    <pkg path="mesa_gears" info="Mesa gears demo"/>
+    <pkg path="nano3d"       info="simple software-rendering demo"/>
+    <pkg path="mesa_gears"   info="Mesa gears demo"/>
+    <pkg path="test-capture" info="test for displaying a capture session"/>
   </index>
 
-  <index name="Virtual machines">
-    <pkg path="vbox5" info="VBox5 for running Linux (generic version)"/>
+  <index name="Virtual machines" arch="x86_64">
+    <pkg path="vbox6"             info="VBox6 for running Linux"/>
+    <pkg path="vbox6-capture"     info="VBox6 + webcam support"/>
     <pkg path="vbox5-nova-sculpt" info="VBox5 for running Linux (NOVA version)" />
-    <pkg path="vbox5-nova-capture" info="VBox5 + Webcam (NOVA version)" />
+  </index>
+
+  <index name="Mesa 3D">
+    <pkg path="mesa_gpu-cpu"   info="software-rendering driver"/>
+    <pkg path="mesa_gpu-intel" info="Intel GPU driver (IRIS)" arch="x86_64"/>
   </index>
 
 </index>
diff --git a/repos/gems/run/sculpt/launcher/recall_fs b/repos/gems/run/sculpt/launcher/recall_fs
deleted file mode 100644
index 85ddd0e1d4..0000000000
--- a/repos/gems/run/sculpt/launcher/recall_fs
+++ /dev/null
@@ -1,6 +0,0 @@
-<launcher pkg="chroot">
-	<route>
-		<service name="File_system"> <child name="default_fs_rw"/> </service>
-	</route>
-	<config> <default-policy path_prefix="/recall" writeable="yes"/> </config>
-</launcher>
diff --git a/repos/os/recipes/pkg/test-capture/runtime b/repos/os/recipes/pkg/test-capture/runtime
index 9def2ba367..5ea55691e7 100644
--- a/repos/os/recipes/pkg/test-capture/runtime
+++ b/repos/os/recipes/pkg/test-capture/runtime
@@ -1,6 +1,6 @@
 <runtime ram="8M" caps="200" binary="test-capture">
 
-	<requires> <gui/> <capture/> <timer/> </requires>
+	<requires> <capture/> <gui/> <timer/> </requires>
 
 	<config period_ms="20" width="1024" height="768">
 		<view/>