diff options
Diffstat (limited to 'support')
| -rw-r--r-- | support/dependencies/check-host-make.mk | 4 | ||||
| -rw-r--r-- | support/misc/Vagrantfile | 2 | ||||
| -rwxr-xr-x | support/scripts/graph-depends | 5 | ||||
| -rw-r--r-- | support/testing/tests/core/test_post_scripts.py | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/support/dependencies/check-host-make.mk b/support/dependencies/check-host-make.mk index 4235a393fd..66560ee85c 100644 --- a/support/dependencies/check-host-make.mk +++ b/support/dependencies/check-host-make.mk @@ -12,8 +12,8 @@ BR2_MAKE ?= $(call suitable-host-package,make,\ $(BR2_MAKE_VERSION_MIN) $(MAKE)) ifeq ($(BR2_MAKE),) -BR2_MAKE = $(HOST_DIR)/bin/make -j$(PARALLEL_JOBS) -BR2_MAKE1 = $(HOST_DIR)/bin/make -j1 +BR2_MAKE = $(HOST_DIR)/bin/host-make -j$(PARALLEL_JOBS) +BR2_MAKE1 = $(HOST_DIR)/bin/host-make -j1 BR2_MAKE_HOST_DEPENDENCY = host-make else BR2_MAKE = $(MAKE) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 400eca0f30..1ca5edc647 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2018.08' +RELEASE='2018.11' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 621e603278..3c091da5e0 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -94,9 +94,10 @@ def get_all_depends(pkgs, get_depends_func): # The Graphviz "dot" utility doesn't like dashes in node names. So for -# node names, we strip all dashes. +# node names, we strip all dashes. Also, nodes can't start with a number, +# so we prepend an underscore. def pkg_node_name(pkg): - return pkg.replace("-", "") + return "_" + pkg.replace("-", "") TARGET_EXCEPTIONS = [ diff --git a/support/testing/tests/core/test_post_scripts.py b/support/testing/tests/core/test_post_scripts.py index a0e5b6b454..40a36b7904 100644 --- a/support/testing/tests/core/test_post_scripts.py +++ b/support/testing/tests/core/test_post_scripts.py @@ -41,8 +41,8 @@ class TestPostScripts(infra.basetest.BRTest): os.path.join(self.builddir, "target"), os.path.join(self.builddir, "target")) self.check_post_log_file("post-fakeroot.log", - os.path.join(self.builddir, "build/buildroot-fs/target"), - os.path.join(self.builddir, "build/buildroot-fs/target")) + os.path.join(self.builddir, "build/buildroot-fs/tar/target"), + os.path.join(self.builddir, "build/buildroot-fs/tar/target")) self.check_post_log_file("post-image.log", os.path.join(self.builddir, "images"), os.path.join(self.builddir, "target")) |
