Updated Dependency names, install script now works on Kali.

util/install.sh

@@ -74,7 +74,7 @@ fi
 KERNEL_NAME=`uname -r`
 KERNEL_HEADERS=kernel-headers-${KERNEL_NAME}
 
-if ! echo $DIST | egrep 'Ubuntu|Debian|Fedora|RedHatEnterpriseServer|CentOS'; then
+if ! echo $DIST | egrep 'Kali|Ubuntu|Debian|Fedora|RedHatEnterpriseServer|CentOS'; then
     echo "Install.sh currently only supports Ubuntu, Debian and Fedora."
     exit 1
 fi
@@ -177,25 +177,25 @@ function wifi_deps {
     if [ "$DIST" = "Fedora" -o "$DIST" = "RedHatEnterpriseServer" -o "$DIST" = "CentOS" ]; then
         $install gcc make socat psmisc xterm openssh-clients iperf libnl3-devel \
             iproute telnet python-setuptools libcgroup-tools openssl-devel \
-            ethtool help2man pyflakes pylint python-pep8 python-pexpect libevent-devel \
+            ethtool help2man python3-pyflakes pylint python-pep8 python-pexpect libevent-devel \
             dbus-devel libconfig-devel epel-release ${PYPKG}-six
     elif [ "$DIST" = "SUSE LINUX"  ]; then
         $install gcc make socat psmisc xterm openssh iperf \
           iproute telnet ${PYPKG}-setuptools libcgroup-tools \
           ethtool help2man ${PYPKG}-pyflakes python3-pylint \
                             python-pep8 ${PYPKG}-pexpect ${PYPKG}-tk
     else
-        pf=pyflakes
+        pf=python3-pyflakes
         if [ $PYTHON_VERSION == 3 ]; then
             ln -sf python3 /usr/bin/python
         fi
         # Starting around 20.04, installing pyflakes instead of pyflakes3
         # causes Python 2 to be installed, which is exactly NOT what we want.
         if [ "$DIST" = "Ubuntu" ] &&  [ `expr $RELEASE '>=' 20.04` = "1" ]; then
-                pf=pyflakes3
+                pf=python3-pyflakes3
         fi
         $install gcc make socat psmisc xterm ssh iperf telnet \
-                 ethtool help2man $pf pylint pep8 \
+                 ethtool help2man $pf pylint python3-pep8 \
                  net-tools \
                  ${PYPKG}-pexpect ${PYPKG}-tk
         # Install pip
@@ -510,7 +510,7 @@ function of {
     else
         $install git-core autotools-dev pkg-config libc6-dev
     fi
-    git clone --depth=1 https://github.com/mininet/openflow
+    git clone --depth=1 https://github.com/JsphByd/openflow
     cd $BUILD_DIR/openflow
 
     # Patch controller to handle more than 16 switches

util/p4-patches/p4-guide-without-mininet.patch

@@ -54,21 +54,21 @@ index 01fdc57..2b19899 100755
 -# recommended using 1.17.1.  So far, it has worked well when doing
 -# _basic_ P4Runtime API testing on a system on which this install
 -# script was run.
--sudo pip install grpcio==1.17.1
+-sudo pip install grpcio==1.17.1 --break-system-packages
 -set -x
 -pip list
 -set +x
 -
 -# Installing the version of grpcio above does not automatically
 -# install a Python protobuf package, so install one.
--sudo pip install protobuf==3.6.1
+-sudo pip install protobuf==3.6.1 --break-system-packages
 -set -x
 -pip list
 -set +x
 -
 -# Things needed for `cd tutorials/exercises/basic ; make run` to work:
 -sudo apt-get --yes install python-psutil libgflags-dev net-tools
--sudo pip install crcmod
+-sudo pip install crcmod --break-system-packages
 -set -x
 -pip list
 -set +x