summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-04-02 07:06:58 -0500
committerJohn Estabrook <jestabro@vyos.io>2022-04-02 08:12:44 -0500
commitaa93d099f0ee8158f5c6a5e03a6bc758dec83e98 (patch)
tree56377fc36c14fb6dc2205c82090d96a43ca924a9 /docker
parent80bdd2122c5700bb55fbcd24912c6a001116dd39 (diff)
downloadvyos-build-aa93d099f0ee8158f5c6a5e03a6bc758dec83e98.tar.gz
vyos-build-aa93d099f0ee8158f5c6a5e03a6bc758dec83e98.zip
docker: T4335: Drop patch for building open-vmdk under gcc-10.+
The issue https://github.com/vmware/open-vmdk/issues/12 is fixed upstream and the patch can be dropped from the Dockerfile.
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f3694298..2b81d513 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -155,8 +155,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \
RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archive/master.zip && \
unzip -d /tmp/ /tmp/open-vmdk-master.zip && \
cd /tmp/open-vmdk-master/ && \
- wget -O gcc-10.patch https://github.com/dongsupark/open-vmdk/commit/74dffbca5d6fa37ed4ecd9b3a75206e33497e3df.patch && \
- patch -p1 < gcc-10.patch && \
make && \
make install