Fix the "Waiting for switches to connect" issue

2 files changed, 60 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5faeed16f876..a6f1246c823a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,43 @@
 pkgbase = mininet-git
 	pkgdesc = Emulator for rapid prototyping of Software Defined Networks
 	pkgver = 20180418
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/mininet/mininet/
 	install = mininet.install
 	arch = x86_64
 	license = custom
+	makedepends = gcc
+	makedepends = make
+	makedepends = automake
+	makedepends = autoconf
+	makedepends = libtool
+	makedepends = git
+	makedepends = socat
+	makedepends = psmisc
 	makedepends = help2man
 	makedepends = python2-setuptools
+	makedepends = python2-pyflakes
+	makedepends = python2-pylint
+	makedepends = python2-autopep8
+	makedepends = python2-pexpect
 	depends = bash
+	depends = iproute2
 	depends = python2
-	depends = python2-networkx
+	depends = libcgroup
 	depends = net-tools
 	depends = iputils
 	depends = iperf
+	depends = inetutils
 	depends = openvswitch
 	optdepends = xorg-xhost
+	optdepends = xterm
+	optdepends = openssh
+	optdepends = oflops
 	provides = mininet
 	conflicts = mininet
 	source = git+https://github.com/mininet/mininet.git
+	source = git+https://github.com/mininet/openflow.git
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = mininet-git
diff --git a/PKGBUILD b/PKGBUILD
index 79a115ab2a74..5a32a6d807a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,53 @@
 
 pkgname=mininet-git
 pkgver=20180418
-pkgrel=1
+pkgrel=2
 pkgdesc="Emulator for rapid prototyping of Software Defined Networks"
-depends=('bash' 'python2' 'python2-networkx' 'net-tools' 'iputils' 'iperf' 'openvswitch')
-optdepends=('xorg-xhost')
-makedepends=('help2man' 'python2-setuptools')
+depends=('bash' 'iproute2' 'python2' 'libcgroup' 'net-tools' 'iputils' 'iperf'
+         'inetutils' 'openvswitch')
+optdepends=('xorg-xhost' 'xterm' 'openssh' 'oflops')
+makedepends=('gcc' 'make' 'automake' 'autoconf' 'libtool' 'git' 'socat' 'psmisc'
+             'help2man' 'python2-setuptools' 'python2-pyflakes' 'python2-pylint'
+             'python2-autopep8' 'python2-pexpect')
 arch=('x86_64')
 url="https://github.com/mininet/mininet/"
 license=('custom')
 provides=('mininet')
 conflicts=('mininet')
 install="mininet.install"
-source=("git+https://github.com/mininet/mininet.git")
-sha256sums=('SKIP')
+source=("git+https://github.com/mininet/mininet.git"
+        "git+https://github.com/mininet/openflow.git")
+sha256sums=('SKIP'
+            'SKIP')
 
-prepare () {
-	cd "$srcdir/mininet"
-	grep python2 Makefile && return
-	grep -rIil '#!.*python' . | xargs -n1 sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:g'
-	grep -rIil '#!.*python' . | xargs -n1 sed -i 's:#!/usr/bin/python:#!/usr/bin/python2:g'
-	sed 's:BINDIR = /usr/bin:BINDIR = $(DESTDIR)/usr/bin:g' -i Makefile
-	sed 's:MANDIR = /usr/share/man/man1:MANDIR = $(DESTDIR)/usr/share/man/man1:g' -i Makefile
-	sed 's:install $(MNEXEC) $(BINDIR):mkdir -p $(BINDIR); install $(MNEXEC) $(BINDIR):g' -i Makefile
-	sed 's:install $(MANPAGES) $(MANDIR):mkdir -p $(MANDIR);install $(MANPAGES) $(MANDIR):g' -i Makefile
-	sed 's:python setup.py:python2 setup.py install --prefix=/usr --root="$(DESTDIR)" --optimize=1:g' -i Makefile
-	sed 's:python :python2 :g' -i Makefile
+prepare() {
+        cd "$srcdir/openflow"
+        sed '/^include debian\/automake.mk/d' -i Makefile.am
+
+        cd "$srcdir/mininet"
+        grep -rIil '#!.*python' . | xargs -n1 sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:g'
+        grep -rIil '#!.*python' . | xargs -n1 sed -i 's:#!/usr/bin/python:#!/usr/bin/python2:g'
+        sed 's:BINDIR = /usr/bin:BINDIR = $(DESTDIR)/usr/bin:g' -i Makefile
+        sed 's:MANDIR = /usr/share/man/man1:MANDIR = $(DESTDIR)/usr/share/man/man1:g' -i Makefile
+        sed 's:install $(MNEXEC) $(BINDIR):mkdir -p $(BINDIR); install $(MNEXEC) $(BINDIR):g' -i Makefile
+        sed 's:install $(MANPAGES) $(MANDIR):mkdir -p $(MANDIR);install $(MANPAGES) $(MANDIR):g' -i Makefile
+        sed 's:python setup.py:python2 setup.py install --prefix=/usr --root="$(DESTDIR)" --optimize=1:g' -i Makefile
+        sed 's:python :python2 :g' -i Makefile
 }
 
-package () {
-	cd "$srcdir/mininet"
-	make DESTDIR="${pkgdir}" install
+build() {
+        cd "$srcdir/openflow"
+        autoreconf --install --force
+        ./configure --prefix=/usr --sbindir=/usr/bin
+        make
 }
+
+package() {
+        cd "$srcdir/openflow"
+        make DESTDIR="${pkgdir}" install
+
+        cd "$srcdir/mininet"
+        make DESTDIR="${pkgdir}" install
+}
+
+# vim: set sw=8 ts=8 et: