From a25e3a4d3be6f3aedfa4088d6ee317d77a660fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 18 Sep 2015 10:53:47 +0200
Subject: Move buildroot submodule to script folder

Novaboot, picosat,... are in script directory. Only buildroot was in
root directory.
---
 .gitmodules                        | 2 +-
 buildroot                          | 1 -
 scripts/buildroot                  | 1 +
 tests/cyclictest/root/.br-external | 2 +-
 tests/cyclictest/root/GNUmakefile  | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 160000 buildroot
 create mode 160000 scripts/buildroot

diff --git a/.gitmodules b/.gitmodules
index 3acdd6d..72f4042 100644
--- 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/buildroot
deleted file mode 160000
index 6d73615..0000000
--- a/buildroot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d73615f0c30349e093ac9764c4d13b5c4b4ee91
diff --git a/scripts/buildroot b/scripts/buildroot
new file mode 160000
index 0000000..6d73615
--- /dev/null
+++ b/scripts/buildroot
@@ -0,0 +1 @@
+Subproject commit 6d73615f0c30349e093ac9764c4d13b5c4b4ee91
diff --git a/tests/cyclictest/root/.br-external b/tests/cyclictest/root/.br-external
index 36e16b2..0a888bb 100644
--- 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 37bd434..7ad6850 100644
--- 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
-- 
cgit v1.2.3