moved klayout dependencies to base

efabless · Aug 6, 2022 · e25bf45 · e25bf45
1 parent 4c41c3f
commit e25bf45
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 24 deletions.
diff --git a/images/base/scripts/dependencies.sh b/images/base/scripts/dependencies.sh
@@ -72,6 +72,33 @@ yum install -y \
 	Xvfb \
 	zlib-devel \
 	zlib-static
+
+yum install -y \
+  gcc-c++ \
+  alsa-lib \
+  libmng \
+  libyaml \
+  pciutils \
+  pciutils-libs \
+  qt \
+  qt-devel \
+  qt-settings \
+  qt-x11 \
+  ruby \
+  ruby-devel \
+  ruby-irb \
+  ruby-libs \
+  rubygem-bigdecimal \
+  rubygem-io-console \
+  rubygem-json \
+  rubygem-psych \
+  rubygem-rdoc \
+  rubygems
+
+yum -y install qt5-qtxmlpatterns-devel qt5-qtxmlpatterns-devel qt5-qtmultimedia-devel qt5-designer qt5-qtsvg-devel  qt5-qttools-devel
+
+
+
 
 alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 60
 

diff --git a/images/foss-asic-tools/scripts/tools.sh b/images/foss-asic-tools/scripts/tools.sh
@@ -33,3 +33,30 @@ yum install -y \
 	meld 
 
 mkdir -p /foss/tools
+
+
+yum install -y \
+  gcc-c++ \
+  alsa-lib \
+  libmng \
+  libyaml \
+  pciutils \
+  pciutils-libs \
+  qt \
+  qt-devel \
+  qt-settings \
+  qt-x11 \
+  ruby \
+  ruby-devel \
+  ruby-irb \
+  ruby-libs \
+  rubygem-bigdecimal \
+  rubygem-io-console \
+  rubygem-json \
+  rubygem-psych \
+  rubygem-rdoc \
+  rubygems
+
+yum -y install qt5-qtxmlpatterns-devel qt5-qtxmlpatterns-devel qt5-qtmultimedia-devel qt5-designer qt5-qtsvg-devel  qt5-qttools-devel
+
+
diff --git a/images/klayout/scripts/dependencies.sh b/images/klayout/scripts/dependencies.sh
@@ -1,27 +1,3 @@
 #!/bin/bash
 
-yum install -y \
-  gcc-c++ \
-  alsa-lib \
-  libmng \
-  libyaml \
-  pciutils \
-  pciutils-libs \
-  qt \
-  qt-devel \
-  qt-settings \
-  qt-x11 \
-  ruby \
-  ruby-devel \
-  ruby-irb \
-  ruby-libs \
-  rubygem-bigdecimal \
-  rubygem-io-console \
-  rubygem-json \
-  rubygem-psych \
-  rubygem-rdoc \
-  rubygems
-
-yum -y install qt5-qtxmlpatterns-devel qt5-qtxmlpatterns-devel qt5-qtmultimedia-devel qt5-designer qt5-qtsvg-devel  qt5-qttools-devel
-
 
diff --git a/launch_vnc.sh b/launch_vnc.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --tty -p 80:80 --user $(id -u):$(id -g) -v $DESIGNS:/foss/designs -e VNC_RESOLUTION=1920x1080 foss-asic-tools:eta
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		docker run --tty -p 80:80 --user $(id -u):$(id -g) -v $DESIGNS:/foss/designs -e VNC_RESOLUTION=1920x1080 foss-asic-tools:eta