ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "make -f" calls

Browse Source
This commit is contained in:
Ehmry - 2019-06-17 14:05:13 +02:00
parent 08ab0cf6fd
commit b945ba006c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tool/builddir/build.mk
View File

@ -291,7 +291,7 @@ gen_deps_and_build_targets: $(INSTALL_DIR) $(DEBUG_DIR) $(LIB_DEP_FILE)
echo " @echo \" \$$(sort \$$(MISSING_PORTS))\""; \
echo " @echo \"\""; \
echo " @echo \"You can prepare respectively update them as follows:\""; \
echo " @echo \"make -f $(GENODE_DIR)/tool/ports/prepare_port \$$(sort \$$(MISSING_PORTS))\""; \
echo " @echo \" $(GENODE_DIR)/tool/ports/prepare_port \$$(sort \$$(MISSING_PORTS))\""; \
echo " @echo \"\""; \
echo " @false"; \
echo "else"; \
@ -321,7 +321,7 @@ RUN_SCRIPT = $(call select_from_repositories,run/$*.run)
run/%: $(call select_from_repositories,run/%.run) $(RUN_ENV)
$(VERBOSE)test -f "$(RUN_SCRIPT)" || (echo "Error: No run script for $*"; exit -1)
$(VERBOSE)expect $(GENODE_DIR)/tool/run/run --genode-dir $(GENODE_DIR) \
$(VERBOSE)$(GENODE_DIR)/tool/run/run --genode-dir $(GENODE_DIR) \
--name $* \
--specs "$(SPECS)" \
--board "$(BOARD)" \

2
tool/depot/extract
View File

@ -159,7 +159,7 @@ handle_missing_ports = $(if $1,$(VERBOSE)( \
echo -e " $(1)"; \
echo -e ""; \
echo -e "You can prepare respectively update them as follows:"; \
echo -e "make -f $(GENODE_DIR)/tool/ports/prepare_port $(1)"; \
echo -e " $(GENODE_DIR)/tool/ports/prepare_port $(1)"; \
echo -e ""; \
false),)

6
tool/run/depot.inc
View File

@ -205,7 +205,7 @@ proc _depot_auto_update { archives } {
# remove duplicates
set archives_to_create [lsort -unique $archives_to_create]
set cmd "make -f [genode_dir]/tool/depot/create $archives_to_create "
set cmd "[genode_dir]/tool/depot/create $archives_to_create "
append cmd "CROSS_DEV_PREFIX=[cross_dev_prefix] "
append cmd "DEPOT_DIR=[depot_dir] "
append cmd "UPDATE_VERSIONS=1 FORCE=1 REBUILD= "
@ -445,12 +445,12 @@ proc check_for_missing_depot_archives { } {
if {[llength $local_user_archives]} {
append create_args " CROSS_DEV_PREFIX=[cross_dev_prefix]"
puts stderr "You may create the following archives locally:\n"
puts stderr "make -f [genode_dir]/tool/depot/create $local_user_archives$create_args\n"
puts stderr " [genode_dir]/tool/depot/create $local_user_archives$create_args\n"
}
if {[llength $foreign_archives]} {
puts stderr "You may try to download the following archives:\n"
puts stderr "make -f [genode_dir]/tool/depot/download $foreign_archives\n"
puts stderr " [genode_dir]/tool/depot/download $foreign_archives\n"
}
exit 1

4
tool/run/grub2.inc
View File

@ -3,7 +3,7 @@
#
proc get_grub2_dir { } {
set ::env(MAKEFLAGS) s
set grub2_path [exec make -f [genode_dir]/tool/ports/current grub2]
set grub2_path [exec [genode_dir]/tool/ports/current grub2]
if {![file exists $grub2_path]} {
puts ""
@ -11,7 +11,7 @@ proc get_grub2_dir { } {
puts " grub2"
puts ""
puts "You can prepare respectively update it as follows:"
puts "make -f [genode_dir]/tool/ports/prepare_port grub2"
puts " [genode_dir]/tool/ports/prepare_port grub2"
puts ""
exit 1
}