From 57e6df51d3685aa3c7e580b690e389e850a72ab3 Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Wed, 9 Sep 2020 16:17:29 -0700
Subject: [PATCH] daemon: removed ospf-mdr as git submodule, due to conflicts
 with being a sub directory of an existing automake project, ospf-mdr will now
 be checked out to parent directory of core

---
 .gitmodules | 3 ---
 ospf-mdr    | 1 -
 tasks.py    | 8 +++++---
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 ospf-mdr

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ecd2bf1c..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ospf-mdr"]
-	path = ospf-mdr
-	url = https://github.com/USNavalResearchLaboratory/ospf-mdr.git
diff --git a/ospf-mdr b/ospf-mdr
deleted file mode 160000
index 26fe5a44..00000000
--- a/ospf-mdr
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 26fe5a4401a26760c553fcadfde5311199e89450
diff --git a/tasks.py b/tasks.py
index 716d8f47..dd86cdf9 100644
--- a/tasks.py
+++ b/tasks.py
@@ -186,9 +186,11 @@ def install_ospf_mdr(c: Context, os_info: OsInfo, hide: bool) -> None:
         c.run("sudo apt install -y libtool gawk libreadline-dev git", hide=hide)
     elif os_info.like == OsLike.REDHAT:
         c.run("sudo yum install -y libtool gawk readline-devel git", hide=hide)
-    ospf_mdr_dir = "ospf-mdr"
-    c.run(f"git submodule update --init -- {ospf_mdr_dir}", hide=hide)
-    with c.cd(ospf_mdr_dir):
+    ospf_dir = "../ospf-mdr"
+    ospf_url = "https://github.com/USNavalResearchLaboratory/ospf-mdr.git"
+    c.run(f"git clone {ospf_url} {ospf_dir}", hide=hide)
+    c.run("git checkout 26fe5a4401a26760c553fcadfde5311199e89450", hide=hide)
+    with c.cd(ospf_dir):
         c.run("./bootstrap.sh", hide=hide)
         c.run(
             "./configure --disable-doc --enable-user=root --enable-group=root "