updated the commits as reflected in the recipe.csv

added kicad
efabless · Mar 5, 2022 · 19ce8e3 · 19ce8e3
1 parent 24d97a4
commit 19ce8e3
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 56 deletions.
diff --git a/image.list b/image.list
diff --git a/images/iverilog/info.json b/images/iverilog/info.json
@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "iverilog",
         "REPO_URL": "https://github.com/steveicarus/iverilog.git",
-        "REPO_COMMIT": "70637db4d35816e23246065f19593295921dd575"
+        "REPO_COMMIT": "8e25be99f9f072f7552d6bb256bc2ba71ad7dace"
     }
 }
diff --git a/images/kicad/Dockerfile b/images/kicad/Dockerfile
@@ -0,0 +1,12 @@
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE} as builder
+
+ARG REPO_URL
+ARG REPO_COMMIT
+ARG NAME
+
+ADD scripts/dependencies.sh dependencies.sh
+RUN bash dependencies.sh
+
+ADD scripts/install.sh install.sh
+RUN bash install.sh
diff --git a/images/kicad/info.json b/images/kicad/info.json
@@ -0,0 +1,9 @@
+{
+    "args": {
+        "GIT": "false",
+        "BASE_IMAGE": "base",
+        "NAME": "kicad",
+        "REPO_URL": "n/a",
+        "REPO_COMMIT": "6.0.2"
+    }
+}
diff --git a/images/kicad/scripts/dependencies.sh b/images/kicad/scripts/dependencies.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/images/kicad/scripts/install.sh b/images/kicad/scripts/install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+yum  --installroot=/foss/tools/kicad --releasever=/ install -y kicad
diff --git a/images/klayout/info.json b/images/klayout/info.json
@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "klayout",
         "REPO_URL": "https://github.com/KLayout/klayout",
-        "REPO_COMMIT": "cee33a00991a70d39f7c0094c5494956be60f77a"
+        "REPO_COMMIT": "da5e287d9a70636312c6155649b60a91b006d990"
     }
 }
diff --git a/images/open_pdks/info.json b/images/open_pdks/info.json
@@ -5,7 +5,7 @@
         "MAGIC_IMAGE": "magic",
         "NAME": "open_pdks",
         "REPO_URL": "https://github.com/RTimothyEdwards/open_pdks",
-        "REPO_COMMIT": "f2a114e9a167d756dace2a8c68f2c061b64a9582",
+        "REPO_COMMIT": "7325e441f4d3763e140fbd1e36ee472bc744d266",
         "SKYWATER_IMAGE": "skywater-pdk"
     }
 }
diff --git a/images/open_pdks/scripts/install.sh b/images/open_pdks/scripts/install.sh
@@ -12,16 +12,21 @@ git clone ${REPO_URL} ${NAME}
 cd ${NAME}
 git checkout master
 git pull
-git checkout -qf ${REPO_COMMIT}
+git checkout -qf ${REPO_COMMIT}git clone https://github.com/RTimothyEdwards/open_pdks.git
 
 ./configure --enable-sky130-pdk=$PDK_ROOT/skywater-pdk  --enable-alpha-sky130 --enable-xschem-sky130 \
             --enable-sram-sky130 --with-sky130-variants=all --datadir=/foss/
 
 make -j$(nproc)
+
+make install
+make -j$(nproc)
 make install
+
 make distclean
 
 cd $PDK_ROOT 
 rm -rf skywater-pdk open_pdks 
-#\rm -rf skywater-pdk open_pdks share
+chmod -R 755 $PDK_ROOT 
+
 
diff --git a/images/openlane/info.json b/images/openlane/info.json
@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "openlane",
         "REPO_URL": "https://github.com/The-OpenROAD-Project/OpenLane",
-        "REPO_COMMIT": "2022.02.23_02.50.41"
+        "REPO_COMMIT": "2022.03.03_02.36.44"
     }
-}
+}
diff --git a/images/opensta/info.json b/images/opensta/info.json
@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "opensta",
         "REPO_URL": "https://github.com/The-OpenROAD-Project/OpenSTA",
-        "REPO_COMMIT": "bbf5584e304a4fd7f47bd6f9eb7867170142a879"
+        "REPO_COMMIT": "3c3f8f61fde2dd28afec9eca81f5b361f22f0cc4"
     }
 }
diff --git a/images/xschem/info.json b/images/xschem/info.json
@@ -4,6 +4,6 @@
         "BASE_IMAGE": "base",
         "NAME": "xschem",
         "REPO_URL": "https://github.com/StefanSchippers/xschem.git",
-        "REPO_COMMIT": "c1a92ab5dc16ada9285e6e0b95c72d68cfa367ce"
+        "REPO_COMMIT": "00de54c582b45cb29246954b80abe5208be876aa"
     }
 }
diff --git a/recipes/recipe.csv b/recipes/recipe.csv
@@ -2,21 +2,22 @@ Name,Version
 base,alpha
 skywater-pdk,f70d8ca46961ff92719d8870a18a076370b85f6c
 magic,47df9da0d3dfe551b5b67e69cd346b040e7e079f
-open_pdks,f2a114e9a167d756dace2a8c68f2c061b64a9582
-openlane,2022.02.23_02.50.41
-klayout,cee33a00991a70d39f7c0094c5494956be60f77a
+open_pdks,7325e441f4d3763e140fbd1e36ee472bc744d266
+openlane,2022.03.03_02.36.44
+klayout,da5e287d9a70636312c6155649b60a91b006d990
 gtkwave,48c6409ed001f28eae9dc5fe87bb0b6b1a7c1217
-iverilog,70637db4d35816e23246065f19593295921dd575
+iverilog,8e25be99f9f072f7552d6bb256bc2ba71ad7dace
 netgen,bfb01e032f668c09ff43e889f35d611ef0e4a317
 riscv-gnu-toolchain-rv32i,63f696c8f23f3eebf5f1af97fd8c66f6483a6393
 gaw3-xschem,a3239fdcc700e7b33331051eb22f47904112e849
 ngscope,0.9.5
 ngspice,1a6a9e6bb60ad8d07ecbfb3f35dea22379fb73e9
-xschem,c1a92ab5dc16ada9285e6e0b95c72d68cfa367ce
+xschem,00de54c582b45cb29246954b80abe5208be876aa
+kicad,6.0.2
 xyce,90f497587bb303bcd160b46269c31f45fd769877
 covered,93bee2e0d89c1beb5943a329109dcf24d59498e6
 irsim,3813495e55a21a024e62e21bd6993fac068a61b9
-opensta,bbf5584e304a4fd7f47bd6f9eb7867170142a879
+opensta,3c3f8f61fde2dd28afec9eca81f5b361f22f0cc4
 cvc,d01c4abd446aaac3fe7f9465611d654536a20a7a
 iic-osic,11743c605ff5f8d638f7a495774ec59f44be5210
 foss-asic-tools,alpha
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		yum --installroot=/foss/tools/kicad --releasever=/ install -y kicad