Revert "Old dpdk with ubuntu"

This reverts commit 68382d7.

Author: czfpga

sdk/apps/virtual-ethernet/patches/pktgen-dpdk/master/dpdk-0006-Fixing-Kernel-Errors.patch

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # Amazon FPGA Hardware Development Kit
 #
@@ -18,7 +18,7 @@
 from __future__ import print_function
 import os
 import sys
-import distro
+import platform
 import glob
 import argparse
 import logging
@@ -54,9 +54,8 @@ def cmd_exec(cmd):
  sys.exit(1)
 
 def install_dpdk_dep():
- installed_distro = distro.name()
- print("installed_distro = {installed_distro}")
- if (installed_distro == "Ubuntu"):
+ distro = platform.linux_distribution()
+ if (distro[0] == "Ubuntu"):
  cmd_exec("apt -y install libnuma-dev")
  cmd_exec("apt -y install libpcap-dev")
  else:
@@ -91,7 +90,7 @@ def install_dpdk(install_path):
  patchfiles = []
  for patchfile in sorted(glob.iglob("%s/000*.patch" % (patches_path))):
  logger.debug("found patchfile=%s" % patchfile)
- patchfiles.append(os.path.abspath(patchfile))
+patchfiles.append(os.path.abspath(patchfile))
 
  # cd to the install_path directory
  os.chdir("%s" % (install_path))

sdk/apps/virtual-ethernet/patches/spp-dpdk/master/0006-Fixing-fallthroughs.patch

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # Amazon FPGA Hardware Development Kit
 #
@@ -18,7 +18,7 @@
 from __future__ import print_function
 import os
 import sys
-import distro
+import platform
 import glob
 import argparse
 import logging
@@ -65,8 +65,8 @@ def cmd_exec(cmd):
  sys.exit(1)
 
 def install_dpdk_dep():
- installed_distro = distro.name()
- if (installed_distro == "Ubuntu"):
+ distro = platform.linux_distribution()
+ if (distro[0] == "Ubuntu"):
  cmd_exec("sudo apt -y install libnuma-dev")
  cmd_exec("sudo apt -y install libpcap-dev")
  else:
@@ -100,12 +100,12 @@ def install_pktgen_dpdk(install_path):
  patchfiles = []
  for patchfile in sorted(glob.iglob("%s/000*.patch" % (patches_path))):
  logger.debug("found patchfile=%s for pktgen" % patchfile)
- patchfiles.append(os.path.abspath(patchfile))
+patchfiles.append(os.path.abspath(patchfile))
  # Read in the dpdk patch filenames
  dpdk_patchfiles = []
  for dpdk_patchfile in sorted(glob.iglob("%s/dpdk*.patch" % (patches_path))):
  logger.debug("found patchfile=%s for dpdk" % dpdk_patchfile)
- dpdk_patchfiles.append(os.path.abspath(dpdk_patchfile))
+dpdk_patchfiles.append(os.path.abspath(dpdk_patchfile))
  # cd to the install_path directory
  os.chdir("%s" % (install_path))
 

sdk/apps/virtual-ethernet/scripts/virtual_ethernet_install.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # Amazon FPGA Hardware Development Kit
 #
@@ -18,7 +18,7 @@
 from __future__ import print_function
 import os
 import sys
-import distro
+import platform
 import glob
 import argparse
 import subprocess
@@ -58,8 +58,8 @@ def cmd_exec(cmd, check_return=True):
  sys.exit(1)
 
 def load_uio():
- installed_distro = distro.name()
- if (installed_distro == "Ubuntu"):
+ distro = platform.linux_distribution()
+ if (distro[0] == "Ubuntu"):
  cmd_exec("modprobe uio")
  else:
  cmd_exec("modprobe uio_pci_generic")
@@ -112,7 +112,7 @@ def setup_dpdk(install_path, eni_dbdf, eni_ethdev):
 
  # Bind the ENI device to to DPDK
  cmd_exec("ifdown %s" % (eni_ethdev))
- cmd_exec("python3 %s --bind=igb_uio %s" % (dpdk_devbind, eni_dbdf))
+ cmd_exec("%s --bind=igb_uio %s" % (dpdk_devbind, eni_dbdf))
 
  # cd back to the original directory
  os.chdir("%s" % (cwd))