Skip to content

Commit f2d5f1d

Browse files
committed
fix KLayout install being skipped on Ubuntu 24.04
The apt fallback for Ubuntu >= 23.04 was silently installing whatever version Ubuntu ships (0.28.16) rather than the pinned 0.30.7 .deb from klayout.org. On 24.04 VMs where klayout was already present via apt, every setup.sh run reported "already the newest version" and skipped the update entirely. Drop the apt fallback so 24.04 uses the same versioned .deb download and checksum verification path as 20.04 and 22.04. Non-LTS versions (23.04, 23.10) now fail fast with a clear message pointing to supported LTS releases. Signed-off-by: Joao Luis Sombrio <sombrio@sombrasoft.dev>
1 parent a1aaea2 commit f2d5f1d

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

etc/DependencyInstaller.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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)"
@@ -227,7 +225,7 @@ _installUbuntuPackages() {
227225
elif [[ $1 == 24.04 ]]; then
228226
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)