Move buildroot submodule to script folder

Novaboot, picosat,... are in script directory. Only buildroot was in
root directory.

diff --git a/.gitmodules b/.gitmodules
index 3acdd6df30a42a3742641bc6d5bd1a88866a664b..72f40425ed24281524885c0c1a8755a3edf1f229 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,7 @@
        path = scripts/novaboot
        url = https://github.com/wentasah/novaboot.git
 [submodule "scripts/buildroot"]
-       path = buildroot
+       path = scripts/buildroot
        url = http://git.buildroot.net/git/buildroot.git
 [submodule "targets/ryuglab/linux"]
        path = targets/ryuglab/linux

diff --git a/buildroot b/scripts/buildroot
similarity index 100%
rename from buildroot
rename to scripts/buildroot

diff --git a/tests/cyclictest/root/.br-external b/tests/cyclictest/root/.br-external
index 36e16b263e0baf04cc9f1c9a10455d5ae0472814..0a888bb3ffc18236cc250cd1a888f7a2b111a8b5 100644 (file)
--- a/tests/cyclictest/root/.br-external
+++ b/tests/cyclictest/root/.br-external
@@ -1 +1 @@
-BR2_EXTERNAL ?= ../tests/cyclictest/root/packages
+BR2_EXTERNAL ?= ../../tests/cyclictest/root/packages

diff --git a/tests/cyclictest/root/GNUmakefile b/tests/cyclictest/root/GNUmakefile
index 37bd4348c94c04e8dc8dfb0240d0a897edc09723..7ad68502b02560dc8721bb0b7e222ad5e77ec4f4 100644 (file)
--- a/tests/cyclictest/root/GNUmakefile
+++ b/tests/cyclictest/root/GNUmakefile
@@ -3,7 +3,7 @@
 lastword = $(word $(words $(1)),$(1))
 makedir := $(dir $(call lastword,$(MAKEFILE_LIST)))
 
-MAKEARGS := -C $(makedir)/../../../buildroot
+MAKEARGS := -C $(makedir)/../../../scripts/buildroot
 MAKEARGS += O=$(if $(patsubst /%,,$(makedir)),$(CURDIR)/)$(patsubst %/,%,$(makedir))
 
 MAKEFLAGS += --no-print-directory