Merge final fixes from internal repositories

tool/autopilot

@@ -305,7 +305,7 @@ foreach platform $platforms {
 # Print label identifying the specified test case to stderr
 #
 proc print_step_label { platform step } {
-	puts -nonewline stderr "[format {%-20s} $platform:] [format {%-20s} $step] "
+	puts -nonewline stderr "[format {%-20s} $platform:] [format {%-22s} $step] "
 }
 
 

tool/builddir/etc/build.conf.generic

@@ -6,37 +6,3 @@
 REPOSITORIES += $(GENODE_DIR)/base
 REPOSITORIES += $(GENODE_DIR)/os
 REPOSITORIES += $(GENODE_DIR)/demo
-
-##
-## Optional repositories
-##
-
-#
-# Ports of popular open-source libraries and the C library
-#
-# Make sure to execute 'make prepare' in 'libports' prior building.
-#
-#REPOSITORIES += $(GENODE_DIR)/libports
-
-#
-# Qt4 tool kit
-#
-# The 'qt4' repository depends on 'libc' and 'libports'
-# Make sure to execute 'make prepare' in 'qt4' prior building.
-#
-#REPOSITORIES += $(GENODE_DIR)/qt4
-
-#
-# Ports of popular 3rd-party applications
-#
-# The 'ports' repository depends on 'libc', 'libports', and 'qt4'.
-# Make sure to execute 'make prepare' in 'ports' prior building.
-#
-#REPOSITORIES += $(GENODE_DIR)/ports
-
-#
-# High-level Genode-specific services and applications
-#
-# The 'gems' repository depends on 'libc', 'libports', and 'qt4'.
-#
-#REPOSITORIES += $(GENODE_DIR)/gems

tool/builddir/etc/build.conf.lx_hybrid_x86

@@ -0,0 +1 @@
+REPOSITORIES  = $(GENODE_DIR)/base-linux

tool/builddir/etc/build.conf.optional

@@ -0,0 +1,34 @@
+
+##
+## Optional repositories
+##
+
+#
+# Ports of popular open-source libraries and the C library
+#
+# Make sure to execute 'make prepare' in 'libports' prior building.
+#
+#REPOSITORIES += $(GENODE_DIR)/libports
+
+#
+# Qt4 tool kit
+#
+# The 'qt4' repository depends on 'libc' and 'libports'
+# Make sure to execute 'make prepare' in 'qt4' prior building.
+#
+#REPOSITORIES += $(GENODE_DIR)/qt4
+
+#
+# Ports of popular 3rd-party applications
+#
+# The 'ports' repository depends on 'libc', 'libports', and 'qt4'.
+# Make sure to execute 'make prepare' in 'ports' prior building.
+#
+#REPOSITORIES += $(GENODE_DIR)/ports
+
+#
+# High-level Genode-specific services and applications
+#
+# The 'gems' repository depends on 'libc', 'libports', and 'qt4'.
+#
+#REPOSITORIES += $(GENODE_DIR)/gems

tool/create_builddir

@@ -21,9 +21,8 @@ usage:
 	@echo "  <platform>   can be 'linux_x86', 'fiasco_x86', 'pistachio_x86',"
 	@echo "               'okl4_x86', 'nova_x86', 'codezero_vpb926',"
 	@echo "               'mb_s3a_starter_kit', foc_x86_32', 'foc_x86_64',"
-	@echo "               ''foc_pbxa9', or 'foc_vea9x4'"
-	@echo "               'or 'foc_pbxa9'"
-	@echo "               "
+	@echo "               'foc_pbxa9', 'foc_vea9x4', or 'lx_hybrid_x86'"
+	@echo
 	@echo "  <build-dir>  is the location of the build directory to create"
 	@echo
 
@@ -78,6 +77,17 @@ $(BUILD_DIR)/etc/build.conf:: $(BUILD_CONF_PLATFORM)
 	@cat $< >> $@
 	@cat $(BUILD_CONF).generic >> $@
 
+#
+# Add optional repositories for all platforms except for lx_hybrid
+#
+# Those repositories rely on Genode's libc or contain device drivers.
+# Both prerequisites are not available for hybrid Linux/Genode programs.
+#
+ifneq ($(PLATFORM),lx_hybrid_x86)
+$(BUILD_DIR)/etc/build.conf::
+	@cat $(BUILD_CONF).optional >> $@
+endif
+
 #
 # Add 'ports-okl4' repository to OKL4 build directory
 #
@@ -139,6 +149,10 @@ mb_s3a_starter_kit::
 mb_ml507::
 	@echo "SPECS = genode mb_ml507" > $(BUILD_DIR)/etc/specs.conf
 
+lx_hybrid_x86::
+	@echo "CROSS_DEV_PREFIX =" > $(BUILD_DIR)/etc/tools.conf
+	@echo "SPECS += always_hybrid" >> $(BUILD_DIR)/etc/specs.conf
+
 $(PLATFORM)::
 	@echo "successfully created build directory at $(BUILD_DIR)"