update

[l4.git] / l4 / Makefile

diff --git a/l4/Makefile b/l4/Makefile
index 259d6cc71bc4e9d21c6987a80afe5a0af98c3de9..f8ce99a73219fac4e3adc8dc53b82f19dff65bc5 100644 (file)
--- a/l4/Makefile
+++ b/l4/Makefile
@@ -388,9 +388,7 @@ define genimage
 endef
 
 define switch_ram_base_func
-       echo "  ... Regenerating RAM_BASE settings"; \
-       echo "# File semi-automatically generated by 'make switch_ram_base'" > $(OBJ_BASE)/Makeconf.ram_base; \
-       echo "# Currently being regenerated"                                >> $(OBJ_BASE)/Makeconf.ram_base; \
+       echo "  ... Regenerating RAM_BASE settings"; set -e; \
        PWD=$(PWD)/pkg/sigma0/server/src $(MAKE) RAM_BASE=$(1) -C pkg/sigma0/server/src;                      \
        PWD=$(PWD)/pkg/moe/server/src    $(MAKE) RAM_BASE=$(1) -C pkg/moe/server/src;                         \
        echo "# File semi-automatically generated by 'make switch_ram_base'" > $(OBJ_BASE)/Makeconf.ram_base; \
@@ -411,7 +409,7 @@ check_and_adjust_ram_base:
          echo "Platform \"$(PLATFORM_TYPE)\" not known."; \
          exit 1;                                          \
        fi
-       $(VERBOSE)if [ $$(($(RAM_BASE))) != $$(($(PLATFORM_RAM_BASE))) ]; then                  \
+       $(VERBOSE)if [ $$(($(RAM_BASE))) != $$(($(PLATFORM_RAM_BASE))) -o -z "$(RAM_BASE)" ]; then               \
          echo "=========== Updating RAM_BASE for platform $(PLATFORM_TYPE) to $(PLATFORM_RAM_BASE) =========" ; \
          $(call switch_ram_base_func,$(PLATFORM_RAM_BASE)); \
        fi
@@ -458,7 +456,7 @@ vbox: $(if $(VBOX_ISOTARGET),$(VBOX_ISOTARGET),grub2iso)
          echo "Need to set name of configured VirtualBox VM im 'VBOX_VM'.";   \
          exit 1;                                                              \
        fi
-       $(VERBOSE)VBoxSDL                       \
+       $(VERBOSE)VirtualBox                    \
            --startvm $(VBOX_VM)                \
            --cdrom $(IMAGES_DIR)/.current.iso  \
            --boot d                            \