Skip to content

Commit 47087d5

Browse files
authored
[xaprepare] update Debian dependencies for current unstable (trixie) (#8169)
Current Debian/unstable (otherwise known as sid), codename trixie, made libncurses5-dev a transitional package and the package replacing it is libncurses-dev Update `xaprepare` to install the new package on systems running Debian `trixie` (13) or newer.
1 parent 69b4ab0 commit 47087d5

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ class LinuxDebian : LinuxDebianCommon
1616
new DebianLinuxProgram ("openjdk-8-jdk"),
1717
};
1818

19+
static readonly List<DebianLinuxProgram> packagesPreTrixie = new List<DebianLinuxProgram> {
20+
new DebianLinuxProgram ("libncurses5-dev"),
21+
};
22+
23+
static readonly List<DebianLinuxProgram> packagesTrixieAndLater = new List<DebianLinuxProgram> {
24+
new DebianLinuxProgram ("libncurses-dev"),
25+
};
26+
1927
// zulu-8 does NOT exist as official Debian package! We need it for our bots, but we have to figure out what to
2028
// do with Debian 10+ in general, as it does not contain OpenJDK 8 anymore and we require it to work.
2129
static readonly List<DebianLinuxProgram> packages10AndNewerBuildBots = new List<DebianLinuxProgram> {
@@ -45,8 +53,26 @@ protected override void InitializeDependencies ()
4553
if (DebianRelease.Major >= 10 || (IsTesting && String.Compare ("buster", CodeName, StringComparison.OrdinalIgnoreCase) == 0)) {
4654
if (Context.IsRunningOnHostedAzureAgent)
4755
Dependencies.AddRange (packages10AndNewerBuildBots);
48-
} else
56+
if (DebianRelease.Major >= 13) {
57+
Dependencies.AddRange (packagesTrixieAndLater);
58+
} else {
59+
Dependencies.AddRange (packagesPreTrixie);
60+
}
61+
} else {
4962
Dependencies.AddRange (packagesPre10);
63+
Dependencies.AddRange (packagesPreTrixie);
64+
}
65+
}
66+
67+
static bool IsDebian13OrNewer (string? version)
68+
{
69+
if (String.IsNullOrEmpty (version)) {
70+
return false;
71+
}
72+
73+
return
74+
version.IndexOf ("trixie", StringComparison.OrdinalIgnoreCase) >= 0 ||
75+
version.IndexOf ("sid", StringComparison.OrdinalIgnoreCase) >= 0;
5076
}
5177

5278
static bool IsDebian10OrNewer (string? version)

build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ abstract class LinuxDebianCommon : Linux
1919
new DebianLinuxProgram ("g++-mingw-w64"),
2020
new DebianLinuxProgram ("gcc-mingw-w64"),
2121
new DebianLinuxProgram ("git"),
22-
new DebianLinuxProgram ("libncurses5-dev"),
2322
new DebianLinuxProgram ("libtool"),
2423
new DebianLinuxProgram ("libz-mingw-w64-dev"),
2524
new DebianLinuxProgram ("linux-libc-dev"),

0 commit comments

Comments
 (0)