afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Blake Harnden 2020-09-09 16:17:29 -07:00
parent 9e3d6681c5
commit 57e6df51d3
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "ospf-mdr"]
path = ospf-mdr
url = https://github.com/USNavalResearchLaboratory/ospf-mdr.git

1
ospf-mdr

@ -1 +0,0 @@
Subproject commit 26fe5a4401a26760c553fcadfde5311199e89450

8
tasks.py
View file

@ -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) c.run("sudo apt install -y libtool gawk libreadline-dev git", hide=hide)
elif os_info.like == OsLike.REDHAT: elif os_info.like == OsLike.REDHAT:
c.run("sudo yum install -y libtool gawk readline-devel git", hide=hide) c.run("sudo yum install -y libtool gawk readline-devel git", hide=hide)
ospf_mdr_dir = "ospf-mdr" ospf_dir = "../ospf-mdr"
c.run(f"git submodule update --init -- {ospf_mdr_dir}", hide=hide) ospf_url = "https://github.com/USNavalResearchLaboratory/ospf-mdr.git"
with c.cd(ospf_mdr_dir): 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("./bootstrap.sh", hide=hide)
c.run( c.run(
"./configure --disable-doc --enable-user=root --enable-group=root " "./configure --disable-doc --enable-user=root --enable-group=root "