From 4e895c237170e3f16d9a265f83fbc2c8a4057414 Mon Sep 17 00:00:00 2001
From: Albert Huntington <ahuntington@sifive.com>
Date: Thu, 8 Apr 2021 16:28:08 -0700
Subject: [PATCH 1/2] Updates for verilator 4.2

---
 Dockerfile.centos | 3 ++-
 Dockerfile.ubuntu | 3 ++-
 README.adoc       | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.centos b/Dockerfile.centos
index ff3a5b549..cb7e12e62 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -11,5 +11,6 @@ RUN yum update -y && yum install -y \
   perl-Digest-MD5 \
   rsync \
   rpm-build \
-  make
+  make \
+  python3
 WORKDIR /usr/src/app
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 4132f1417..cfcbb1caf 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -4,5 +4,6 @@ RUN apt-get update && apt-get install -y \
   bison \
   flex \
   g++ \
-  make
+  make \
+  python3
 WORKDIR /usr/src/app
diff --git a/README.adoc b/README.adoc
index f784828c0..02590d9d5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -14,6 +14,11 @@ git remote add verilator git@github.com:verilator/verilator.git
 git fetch verilator
 git checkout v4.028
 git cherry-pick origin/master -X theirs
+# git will likely want you to resolve the fact that the README.adoc and
+# .travis.yaml files are not in the repo here.
+git add README.adoc
+git add .travis.yaml
+git cherry-pick --continue
 git tag 4.028-0sifive1
 git push origin 4.028-0sifive1
 ----

From 4e687f42d31f665319086429b8a549449c6e872f Mon Sep 17 00:00:00 2001
From: Albert Huntington <ahuntington@sifive.com>
Date: Thu, 8 Apr 2021 17:50:09 -0700
Subject: [PATCH 2/2] Update manifest ignore file.

---
 MANIFEST.SKIP | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index c0d696663..d2039670a 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -65,3 +65,7 @@ ci/
 obj_dir.*
 TAGS
 .*~
+Dockerfile.*
+README.adoc
+build-deb.sh
+build-rpm.sh