From fd68a50149b776420896b24b972b54405fb94939 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 6 Jul 2023 09:44:49 +0200 Subject: [PATCH] [xaprepare] update Debian dependencies for current unstable (trixie) --- .../Dependencies/Linux.Debian.cs | 28 ++++++++++++++++++- .../Dependencies/Linux.DebianCommon.cs | 1 - 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs index f904472855a..a20b2b3504e 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs @@ -16,6 +16,14 @@ class LinuxDebian : LinuxDebianCommon new DebianLinuxProgram ("openjdk-8-jdk"), }; + static readonly List packagesPreTrixie = new List { + new DebianLinuxProgram ("libncurses5-dev"), + }; + + static readonly List packagesTrixieAndLater = new List { + new DebianLinuxProgram ("libncurses-dev"), + }; + // zulu-8 does NOT exist as official Debian package! We need it for our bots, but we have to figure out what to // do with Debian 10+ in general, as it does not contain OpenJDK 8 anymore and we require it to work. static readonly List packages10AndNewerBuildBots = new List { @@ -45,8 +53,26 @@ protected override void InitializeDependencies () if (DebianRelease.Major >= 10 || (IsTesting && String.Compare ("buster", CodeName, StringComparison.OrdinalIgnoreCase) == 0)) { if (Context.IsRunningOnHostedAzureAgent) Dependencies.AddRange (packages10AndNewerBuildBots); - } else + if (DebianRelease.Major >= 13) { + Dependencies.AddRange (packagesTrixieAndLater); + } else { + Dependencies.AddRange (packagesPreTrixie); + } + } else { Dependencies.AddRange (packagesPre10); + Dependencies.AddRange (packagesPreTrixie); + } + } + + static bool IsDebian13OrNewer (string? version) + { + if (String.IsNullOrEmpty (version)) { + return false; + } + + return + version.IndexOf ("trixie", StringComparison.OrdinalIgnoreCase) >= 0 || + version.IndexOf ("sid", StringComparison.OrdinalIgnoreCase) >= 0; } static bool IsDebian10OrNewer (string? version) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs index 71a4e2d2f8f..a37e9ff3217 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs @@ -19,7 +19,6 @@ abstract class LinuxDebianCommon : Linux new DebianLinuxProgram ("g++-mingw-w64"), new DebianLinuxProgram ("gcc-mingw-w64"), new DebianLinuxProgram ("git"), - new DebianLinuxProgram ("libncurses5-dev"), new DebianLinuxProgram ("libtool"), new DebianLinuxProgram ("libz-mingw-w64-dev"), new DebianLinuxProgram ("linux-libc-dev"),