Skip to content

Commit f7290b3

Browse files
authored
Merge pull request #4053 from The-OpenROAD-Project-staging/klayout-upgrade
upgrade klayout to version 0.30.7
2 parents 7b9c592 + f2d5f1d commit f7290b3

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

etc/DependencyInstaller.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ else
1010
fi
1111

1212
# package versions
13-
klayoutVersion=0.30.3
13+
klayoutVersion=0.30.7
1414
if [[ "$OSTYPE" == "darwin"* ]]; then
1515
numThreads=$(sysctl -n hw.logicalcpu)
1616
else
@@ -199,8 +199,6 @@ _installUbuntuPackages() {
199199
# install KLayout
200200
if [[ $1 == "rodete" ]]; then
201201
apt-get -y install --no-install-recommends klayout python3-pandas
202-
elif _versionCompare "$1" -ge 23.04; then
203-
apt-get -y install --no-install-recommends klayout python3-pandas
204202
else
205203
arch=$(uname -m)
206204
lastDir="$(pwd)"
@@ -221,13 +219,13 @@ _installUbuntuPackages() {
221219
fi
222220
else
223221
if [[ $1 == 20.04 ]]; then
224-
klayoutChecksum=e83be08033f2f69d83ab7bd494a7a858
222+
klayoutChecksum=e95175a8053d3577375fbd3a7b3d7dbf
225223
elif [[ $1 == 22.04 ]]; then
226-
klayoutChecksum=6e431b0a1a34c16eab9958a2c28f88bd
224+
klayoutChecksum=202530d198b0c7b93aa5af0e8e438ccd
227225
elif [[ $1 == 24.04 ]]; then
228-
klayoutChecksum=2d186f0225dbac7ae2d790aa8fa57814
226+
klayoutChecksum=145adaa044101bb41179aa63ec6d7f86
229227
else
230-
echo "Unrecognized version of Ubuntu $1. Please install KLayout manually"
228+
echo "Unsupported Ubuntu version $1. Supported versions: 20.04, 22.04, 24.04. Please upgrade to a supported LTS release or install KLayout ${klayoutVersion} manually from https://www.klayout.org/build.html"
231229
exit 1
232230
fi
233231
wget https://www.klayout.org/downloads/Ubuntu-${1%.*}/klayout_${klayoutVersion}-1_amd64.deb

0 commit comments

Comments
 (0)