clean up

images/gaw3-xschem/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "gaw3-xschem",
         "REPO_URL": "https://github.com/StefanSchippers/xschem-gaw.git",
-        "REPO_COMMIT": "98bfc8636f8642ae60e89fde009f83abe3cee9f1"
+        "REPO_COMMIT": "854bee4cf20663a632840256737d0d68b5eca417"
     }
 }

images/gtkwave/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "gtkwave",
         "REPO_URL": "https://github.com/gtkwave/gtkwave",
-        "REPO_COMMIT": "48c6409ed001f28eae9dc5fe87bb0b6b1a7c1217"
+        "REPO_COMMIT": "49a2a53caee83890dff503c15815fb53d5ccde74"
     }
 }

images/iverilog/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "iverilog",
         "REPO_URL": "https://github.com/steveicarus/iverilog.git",
-        "REPO_COMMIT": "2693dd32b075243cca20400cf3a808cef119477e"
+        "REPO_COMMIT": "c7cb13d302e13cac77701045fd7935a9b81b9e89"
     }
 }

images/klayout/Dockerfile

@@ -5,8 +5,8 @@ ARG REPO_URL
 ARG REPO_COMMIT
 ARG NAME
 #
-ADD scripts/dependencies.sh dependencies.sh
-RUN bash dependencies.sh
+#ADD scripts/dependencies.sh dependencies.sh
+#RUN bash dependencies.sh
 
 ADD scripts/install.sh install.sh
 RUN bash install.sh

images/klayout/info.json

@@ -1,9 +1,10 @@
 {
     "args": {
-        "GIT": "true",
+        "GIT": "false",
         "BASE_IMAGE": "base",
         "NAME": "klayout",
-        "REPO_URL": "https://github.com/KLayout/klayout",
-        "REPO_COMMIT": "17e643ce5bf0f7a6fdc23151eaa2803f5c86e249"
+        "REPO_URL": "n/a",
+        "REPO_COMMIT": "0.27.10-0"
     }
-}
+}
+

images/klayout/scripts/dependencies.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-yum install -y \
+#yum install -y \
+  gcc-c++ \
   alsa-lib \
   libmng \
   libyaml \

images/klayout/scripts/install.sh

@@ -1,13 +1,21 @@
 #!/bin/bash
 
-source scl_source enable devtoolset-8
 
-git clone ${REPO_URL} ${NAME}
-cd ${NAME}
-git checkout ${REPO_COMMIT}
+wget https://www.klayout.org/downloads/CentOS_7/klayout-0.27.10-0.x86_64.rpm 
+yum  --installroot=/foss/tools/klayout --releasever=/ install -y klayout-0.27.10-0.x86_64.rpm
 
-prefix=/foss/tools/${NAME}/${REPO_COMMIT}
-mkdir -p $prefix
-./build.sh -j$(nproc) -prefix "$prefix"
-./build.sh -j$(nproc) -prefix "$prefix"
 
+
+
+#\rm -f /usr/bin/gmake && ln -s /usr/bin/make /usr/bin/gmake
+
+#git clone ${REPO_URL} ${NAME}
+#cd ${NAME}
+#git checkout ${REPO_COMMIT}
+
+#./configure --prefix=/foss/tools/${NAME}/${REPO_COMMIT}
+
+#mkdir -p /foss/tools/klayout/1081c17
+
+#git clone https://github.com/KLayout/klayout && cd klayout/ && git checkout 1081c17 && ./build.sh -j$(nproc) -prefix /foss/tools/klayout/1081c17
+

images/magic/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "magic",
         "REPO_URL": "https://github.com/rtimothyedwards/magic",
-        "REPO_COMMIT": "085131b090cb511d785baf52a10cf6df8a657d44"
+        "REPO_COMMIT": "f7df5e7c86fb47c5fd445c846afddc6fbabad6ae"
     }
 }

images/netgen/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "netgen",
         "REPO_URL": "https://github.com/rtimothyedwards/netgen",
-        "REPO_COMMIT": "f8ed4e42e272a4fb6b69321114516b374d3d4183"
+        "REPO_COMMIT": "2056b37c95e11ea802f8b06c8948e874a298808a"
     }
 }

images/ngspice/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "ngspice",
         "REPO_URL": "https://git.code.sf.net/p/ngspice/ngspice",
-        "REPO_COMMIT": "c4efe2e3ac264b6889e844f935410f9a795f1a68"
+        "REPO_COMMIT": "0faf386d45521f7ed82f621266b3990adc982b50"
     }
 }

images/opensta/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "opensta",
         "REPO_URL": "https://github.com/The-OpenROAD-Project/OpenSTA",
-        "REPO_COMMIT": "3992c34aee97a8f4dbd4e88580d7277441012e9d"
+        "REPO_COMMIT": "097086eaad759c567559fb8bd8469835b1c1b1a2"
     }
 }

images/xschem/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "xschem",
         "REPO_URL": "https://github.com/StefanSchippers/xschem.git",
-        "REPO_COMMIT": "1bd2e750e12c8fad714e05c148959e6df498cd3a"
+        "REPO_COMMIT": "c9d16d6008632ee6888415a2c84f33931b528b10"
     }
 }

images/xyce/info.json

@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "xyce",
         "REPO_URL": "https://github.com/Xyce/Xyce.git",
-        "REPO_COMMIT": "437c914dd529173aa693f3e26e33517b9c28b323"
+        "REPO_COMMIT": "320b43d104cfe559be5acc4d04afd90f7a179096"
     }
 }

recipes/recipe.csv

@@ -1,22 +1,22 @@
 Name,Version
 base,alpha
-magic,085131b090cb511d785baf52a10cf6df8a657d44
+magic,f7df5e7c86fb47c5fd445c846afddc6fbabad6ae
 pdks-volare,8fe7f760ece2bb49b1c310e60243f0558977dae5
 openlane,2022.05.30_01.41.33
-klayout,17e643ce5bf0f7a6fdc23151eaa2803f5c86e249
-gtkwave,48c6409ed001f28eae9dc5fe87bb0b6b1a7c1217
-iverilog,2693dd32b075243cca20400cf3a808cef119477e
-netgen,f8ed4e42e272a4fb6b69321114516b374d3d4183
+klayout,0.27.10-0
+gtkwave,49a2a53caee83890dff503c15815fb53d5ccde74
+iverilog,c7cb13d302e13cac77701045fd7935a9b81b9e89
+netgen,2056b37c95e11ea802f8b06c8948e874a298808a
 riscv-gnu-toolchain-rv32i,409b951ba6621f2f115aebddfb15ce2dd78ec24f
-gaw3-xschem,98bfc8636f8642ae60e89fde009f83abe3cee9f1
+gaw3-xschem,854bee4cf20663a632840256737d0d68b5eca417
 ngscope,0.9.5
-ngspice,c4efe2e3ac264b6889e844f935410f9a795f1a68
-xschem,1bd2e750e12c8fad714e05c148959e6df498cd3a
+ngspice,0faf386d45521f7ed82f621266b3990adc982b50
+xschem,c9d16d6008632ee6888415a2c84f33931b528b10
 kicad,6.0.2
-xyce,437c914dd529173aa693f3e26e33517b9c28b323
+xyce,320b43d104cfe559be5acc4d04afd90f7a179096
 covered,93bee2e0d89c1beb5943a329109dcf24d59498e6
 irsim,3813495e55a21a024e62e21bd6993fac068a61b9
-opensta,3992c34aee97a8f4dbd4e88580d7277441012e9d
+opensta,097086eaad759c567559fb8bd8469835b1c1b1a2
 cvc,d01c4abd446aaac3fe7f9465611d654536a20a7a
 iic-osic,a98da34600c0f6ed74a6e29133db770d81bf2760
 foss-asic-tools,eta