Add March 2021 VM based on Ubuntu 20.04 (#403)

* First draft of Ubuntu 20.04 Vagrantfile and scripts to install 2021-Mar version of open source P4 development tools. * Add more tracing output of what files have been installed at each step * Don't do behavioral-model install_deps.sh before installing PI This is an experiment to see if the end result will be able to run tutorials basic exercise using Python3 only on an Ubuntu 20.04 system. Just before this commit, `vagrant up` resulted in a system that failed to run the basic exercise, because python3 failed to import google.grpc (if I recall correctly -- it may have been a different google.<something> Python3 module name). * Add missing patch file * Fix copy and paste mistake * Add missing patch file * Change how protobuf Python3 module files are installed * Correct a few desktop icon file names, and add clean.sh script * Enhance clean.sh script, and add README for manual steps in creating a VM * Changes to try to always use Python3, never Python2, in tutorials * Update README steps for preparing a VM * More additions to README on steps to create a single file VM image * Add empty-disk-block zeroing to clean.sh script * Also install PTF * Update versions of P4 dev tool source code to 2021-Apr-05 This includes a change to p4lang/PI that allows P4Runtime API clients to send the shortest byte sequences necessary to encode integer values, which I want for a PTF test that I have recently created. * Update README for 2021-Apr-05 version of VM image * Resolve Python 3 compatibility issues Most of the Python 2 to 3 code translation changes were automated with the 2to3 tool. Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org> * Update commit SHAs for 4 p4lang repos to latest as of 2021-May-04 * Update Ubuntu 20.04 README.md for how I created 2021-May-04 version of VM * mycontroller: Use Python 3 shebang line Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org> * Update Ubuntu 20.04 README.md for how I created 2021-Jun-01 version of VM * Update commit SHAs for 4 p4lang repos to latest as of 2021-Jul-07 * Update Ubuntu 20.04 README.md for how I created 2021-Jul-07 version of VM * Update commit SHAs for 4 p4lang repos to latest as of 2021-Aug-01 * Update Ubuntu 20.04 README.md for how I created 2021-Aug-01 version of VM * Update commit SHAs for 4 p4lang repos to latest as of 2021-Sep-07 * Update Ubuntu 20.04 README.md for how I created 2021-Sep-07 version of VM Co-authored-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
2021-09-07 19:34:30 -07:00
parent 4914893445
commit c7f3139533
47 changed files with 1482 additions and 209 deletions
--- a/vm-ubuntu-20.04/patches/behavioral-model-use-correct-libssl-pkg.patch
+++ b/vm-ubuntu-20.04/patches/behavioral-model-use-correct-libssl-pkg.patch
@@ -0,0 +1,18 @@
+diff --git a/install_deps.sh b/install_deps.sh
+index 7acf14d..bdd1d03 100755
+--- a/install_deps.sh
+++ b/install_deps.sh
+@@ -1,7 +1,10 @@
+ #!/bin/bash
+ set -e
+ ubuntu_release=`lsb_release -s -r`
+-if [[ "${ubuntu_release}" > "18" ]]
+if [[ "${ubuntu_release}" > "19" ]]
+then
+    LIBSSL_DEV="libssl-dev"
+elif [[ "${ubuntu_release}" > "18" ]]
+ then
+     # This older package libssl1.0-dev enables compiling Thrift 0.9.2
+     # on Ubuntu 18.04.  Package libssl-dev exists, but Thrift 0.9.2
+diff --git a/travis/install-thrift.sh b/travis/install-thrift.sh
+index 2ea4177..c17de69 100644
--- a/vm-ubuntu-20.04/patches/disable-Wno-error-and-other-small-changes.diff
+++ b/vm-ubuntu-20.04/patches/disable-Wno-error-and-other-small-changes.diff
@@ -0,0 +1,78 @@
+diff --git a/Makefile b/Makefile
+index 736583fd93..472d91337d 100644
+--- a/Makefile
+++ b/Makefile
+@@ -300,37 +300,37 @@ else
+ TMPOUT = `mktemp /tmp/test-out-XXXXXX`
+ endif
+ 
+-CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Werror -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc
+CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc
+ HAS_WORKING_NO_CXX14_COMPAT = $(shell $(CHECK_NO_CXX14_COMPAT_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_CXX14_COMPAT),true)
+ W_NO_CXX14_COMPAT=-Wno-c++14-compat
+ endif
+ 
+-CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Werror -Wshadow -o $(TMPOUT) -c test/build/shadow.c
+CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Wshadow -o $(TMPOUT) -c test/build/shadow.c
+ HAS_WORKING_SHADOW = $(shell $(CHECK_SHADOW_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_SHADOW),true)
+ W_SHADOW=-Wshadow
+ NO_W_SHADOW=-Wno-shadow
+ endif
+-CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Werror -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c
+CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c
+ HAS_WORKING_EXTRA_SEMI = $(shell $(CHECK_EXTRA_SEMI_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_EXTRA_SEMI),true)
+ W_EXTRA_SEMI=-Wextra-semi
+ NO_W_EXTRA_SEMI=-Wno-extra-semi
+ endif
+-CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-shift-negative-value -o $(TMPOUT) -c test/build/no-shift-negative-value.c
+CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -Wno-shift-negative-value -o $(TMPOUT) -c test/build/no-shift-negative-value.c
+ HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE = $(shell $(CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE),true)
+ W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value
+ NO_W_NO_SHIFT_NEGATIVE_VALUE=-Wshift-negative-value
+ endif
+-CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c
+CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c
+ HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE = $(shell $(CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE),true)
+ W_NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
+ NO_W_NO_UNUSED_BUT_SET_VARIABLE=-Wunused-but-set-variable
+ endif
+-CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-maybe-uninitialized -o $(TMPOUT) -c test/build/no-maybe-uninitialized.c
+CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD = $(CC) -std=c99 -Wno-maybe-uninitialized -o $(TMPOUT) -c test/build/no-maybe-uninitialized.c
+ HAS_WORKING_NO_MAYBE_UNINITIALIZED = $(shell $(CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_MAYBE_UNINITIALIZED),true)
+ W_NO_MAYBE_UNINITIALIZED=-Wno-maybe-uninitialized
+@@ -353,7 +353,7 @@ ifeq ($(SYSTEM),Darwin)
+ CXXFLAGS += -stdlib=libc++
+ endif
+ CXXFLAGS += -Wnon-virtual-dtor
+-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
+CPPFLAGS += -g -Wall -Wextra -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
+ COREFLAGS += -fno-rtti -fno-exceptions
+ LDFLAGS += -g
+ 
+@@ -10180,7 +10180,7 @@ PUBLIC_HEADERS_C += \
+ LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBARES_SRC))))
+ 
+ $(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
+-$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
+$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),)
+ 
+ $(LIBDIR)/$(CONFIG)/libares.a:  $(LIBARES_OBJS) 
+ 	$(E) "[AR]      Creating $@"
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f0c2..59bc0fee95 100644
+--- a/src/core/lib/gpr/log_linux.cc
+++ b/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,6 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-static long gettid(void) { return syscall(__NR_gettid); }
+ 
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
--- a/vm-ubuntu-20.04/patches/mininet-dont-install-python2.patch
+++ b/vm-ubuntu-20.04/patches/mininet-dont-install-python2.patch
@@ -0,0 +1,32 @@
+diff --git a/util/install.sh b/util/install.sh
+index 0a67871..7076dbe 100755
+--- a/util/install.sh
+++ b/util/install.sh
+@@ -5,6 +5,7 @@
+ 
+ # Fail on error
+ set -e
+set -x
+ 
+ # Fail on unset var usage
+ set -o nounset
+@@ -174,15 +175,16 @@ function mn_deps {
+                         python-pep8 ${PYPKG}-pexpect ${PYPKG}-tk
+     else  # Debian/Ubuntu
+         pf=pyflakes
+-        # Starting around 20.04, installing pyflakes instead of pyflakes3
+        # Starting around 18.04, installing pyflakes instead of pyflakes3
+         # causes Python 2 to be installed, which is exactly NOT what we want.
+-        if [ `expr $RELEASE '>=' 20.04` = "1" ]; then
+        if [ `expr $RELEASE '>=' 18.04` = "1" ]; then
+                 pf=pyflakes3
+         fi
+         $install gcc make socat psmisc xterm ssh iperf telnet \
+-                 ethtool help2man $pf pylint pep8 \
+                 ethtool help2man pylint3 pep8 \
+                  net-tools \
+                  ${PYPKG}-pexpect ${PYPKG}-tk
+        $install --no-install-recommends $pf
+         # Install pip
+         $install ${PYPKG}-pip || $install ${PYPKG}-pip-whl
+         if ! ${PYTHON} -m pip -V; then