diff --git a/image.list b/image.list deleted file mode 100644 index 576665b0..00000000 --- a/image.list +++ /dev/null @@ -1,41 +0,0 @@ -novnc 679b45fa3b453c7cf32f4b4455f4814818ecf161 822fc86ff1a5 47 minutes ago 1.84GB -novnc latest 822fc86ff1a5 47 minutes ago 1.84GB -efabless/dv alpha 73cfedcaaf05 9 days ago 3.43GB -efabless/dv latest 73cfedcaaf05 9 days ago 3.43GB -iverilog 668f9850bc74c49842302891d63d7d42058e4a11 491e5acf4c5f 9 days ago 2.42GB -opensta 104f90089a0e4427e1fa03d59a583e7414fbbb20 27559e72a26d 9 days ago 2.05GB -riscv-gnu-toolchain-rv32i 411d134 47da00257b65 9 days ago 13.2GB -efabless/foss-asic-tools alpha 50034acd7d31 9 days ago 9.31GB -cvc d01c4abd446aaac3fe7f9465611d654536a20a7a e6c9806a56dc 9 days ago 1.9GB -cvc latest e6c9806a56dc 9 days ago 1.9GB -opensta 6802190c15625b2f72e1a04c0f5763e8cd65a490 8a567c1156be 9 days ago 2.05GB -irsim 3813495e55a21a024e62e21bd6993fac068a61b9 d5da00156c7f 9 days ago 1.84GB -irsim latest d5da00156c7f 9 days ago 1.84GB -covered 93bee2e0d89c1beb5943a329109dcf24d59498e6 c9c7bc971183 9 days ago 2.18GB -covered latest c9c7bc971183 9 days ago 2.18GB -xyce f5d3d9906a103711bbde83b17d3a6afd6b33fc20 414b81773f76 9 days ago 5.13GB -xschem 432db0799ea068707cad65f84fe4b8f9b7c00ce5 d74f90068bcb 9 days ago 2.22GB -ngspice 1a6a9e6bb60ad8d07ecbfb3f35dea22379fb73e9 ccadc5eba435 9 days ago 2.51GB -ngspice latest ccadc5eba435 9 days ago 2.51GB -ngscope 0.9.5 713699eb9f9d 9 days ago 2.38GB -ngscope latest 713699eb9f9d 9 days ago 2.38GB -gaw3-xschem a3239fdcc700e7b33331051eb22f47904112e849 5cd773acd912 9 days ago 2.17GB -gaw3-xschem latest 5cd773acd912 9 days ago 2.17GB -riscv-gnu-toolchain-rv32i f640044a947afb39c78b96fa1ba1db8aa31b1d89 f4b1e96f2c04 9 days ago 13.3GB -netgen bfb01e032f668c09ff43e889f35d611ef0e4a317 c40f66f2a351 9 days ago 1.84GB -netgen latest c40f66f2a351 9 days ago 1.84GB -iverilog 922a2e0e131e6cbf66ad4a4195fd1d5d9b624c08 df118229f612 9 days ago 2.43GB -gtkwave 48c6409ed001f28eae9dc5fe87bb0b6b1a7c1217 b5c4137c7ccc 9 days ago 2.25GB -gtkwave latest b5c4137c7ccc 9 days ago 2.25GB -klayout ffb81a66eac7bddfc7dc8aef3edf22241f677d01 55cf1eadbad6 9 days ago 11.9GB -base alpha 137903c0c3e5 9 days ago 1.83GB -base latest 137903c0c3e5 9 days ago 1.83GB -xschem 62766fd618d5bd932e04e8d12e295562717f00b1 7dbe9306e236 10 days ago 2.9GB -open_pdks a3d6ffea8022332b859daa454cef7ee7131c5181 28468793abcd 10 days ago 5.79GB -klayout 477afd4a4dea1127c828ac5a49978744121a4976 5beac4564ab3 10 days ago 12.6GB -efabless/openlane latest 34a002c03044 10 days ago 1.14GB -asic-tools private 7aaea2b2dd62 10 days ago 15.5GB -efabless/openlane 2022.02.04_01.51.22 12c67decd5f1 11 days ago 1.14GB -ubuntu latest 54c9d81cbb44 13 days ago 72.8MB -efabless/openlane 2021.11.23_01.42.34 8535c5295307 2 months ago 1.27GB -efabless/dv_setup latest 17d9828dab9e 13 months ago 10.8GB diff --git a/images/iverilog/info.json b/images/iverilog/info.json index 7467273d..733ac67f 100755 --- 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" } } \ No newline at end of file diff --git a/images/kicad/Dockerfile b/images/kicad/Dockerfile new file mode 100755 index 00000000..d42a6e28 --- /dev/null +++ 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 new file mode 100755 index 00000000..2d756b44 --- /dev/null +++ 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 new file mode 100755 index 00000000..a9bf588e --- /dev/null +++ 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 new file mode 100755 index 00000000..2a350193 --- /dev/null +++ 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 index 68040238..aa26dc04 100755 --- 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" } } \ No newline at end of file diff --git a/images/open_pdks/info.json b/images/open_pdks/info.json index e4f4c5db..be571e3e 100755 --- 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" } } \ No newline at end of file diff --git a/images/open_pdks/scripts/install.sh b/images/open_pdks/scripts/install.sh index 291d334e..230f45ed 100755 --- 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 index 91832f6d..2fab2754 100755 --- 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" } -} +} \ No newline at end of file diff --git a/images/opensta/info.json b/images/opensta/info.json index 705fac63..76494442 100755 --- 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" } } \ No newline at end of file diff --git a/images/xschem/info.json b/images/xschem/info.json index 0a39436f..703aa4fc 100755 --- 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" } } \ No newline at end of file diff --git a/recipes/recipe.csv b/recipes/recipe.csv index c3e6f138..dc60bb02 100755 --- 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