From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 4 May 2017 16:20:29 +0000 (-0400)
Subject: *: Remove cumulus Directory
X-Git-Tag: reindent-master-before~193^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=56bdfe7d2a1fd61268a0406397b071b0cbeca3b7;p=matthieu%2Ffrr.git

*: Remove cumulus Directory

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/Makefile.am b/Makefile.am
index 89e7ea890e..f287038fdf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
 	 @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
          @ISISD@ @PIMD@ @NHRPD@ \
 	 @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
-         redhat @SOLARIS@ tests tools cumulus snapcraft
+         redhat @SOLARIS@ tests tools snapcraft
 
 DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
 	  isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
-	  solaris pimd nhrpd @LIBRFP@ @RFPTEST@ tools cumulus snapcraft
+	  solaris pimd nhrpd @LIBRFP@ @RFPTEST@ tools snapcraft
 
 EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
 	update-autotools \
diff --git a/configure.ac b/configure.ac
index d376bf1464..3d3c258bec 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1831,7 +1831,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
 	  nhrpd/Makefile
 	  redhat/Makefile
 	  tools/Makefile
-	  cumulus/Makefile
 	  pkgsrc/Makefile
 	  fpm/Makefile
 	  redhat/frr.spec 
diff --git a/cumulus/.gitignore b/cumulus/.gitignore
deleted file mode 100644
index 2a198f5d45..0000000000
--- a/cumulus/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-ssd
diff --git a/cumulus/Makefile.am b/cumulus/Makefile.am
deleted file mode 100644
index 2601c7ddb3..0000000000
--- a/cumulus/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-EXTRA_DIST = etc/frr/debian.conf etc/frr/daemons etc/default/frr