Skip to content

Commit ea331b7

Browse files
Merge pull request #2361 from aleksandrychev/ENT-14191_3.27.x
ENT-14191: Added Ubuntu 26 (3.27.x)
2 parents 28ad1a0 + 54c7954 commit ea331b7

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

build-scripts/labels.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ PACKAGES_HUB_x86_64_linux_ubuntu_22
1414
PACKAGES_HUB_arm_64_linux_ubuntu_22
1515
PACKAGES_HUB_x86_64_linux_ubuntu_24
1616
PACKAGES_HUB_arm_64_linux_ubuntu_24
17+
PACKAGES_HUB_x86_64_linux_ubuntu_26
18+
PACKAGES_HUB_arm_64_linux_ubuntu_26
1719

1820
PACKAGES_x86_64_linux_debian_12
1921
PACKAGES_arm_64_linux_debian_12
@@ -32,5 +34,7 @@ PACKAGES_x86_64_linux_ubuntu_22
3234
PACKAGES_arm_64_linux_ubuntu_22
3335
PACKAGES_x86_64_linux_ubuntu_24
3436
PACKAGES_arm_64_linux_ubuntu_24
37+
PACKAGES_x86_64_linux_ubuntu_26
38+
PACKAGES_arm_64_linux_ubuntu_26
3539

3640
PACKAGES_x86_64_mingw

ci/cfengine-build-host-setup.cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bundle agent cfengine_build_host_setup
2020

2121
"shellcheck" comment => "not sure why only ubuntu-20 needed this.";
2222

23-
debian.(!debian_13.!debian_12.!ubuntu_22.!ubuntu_24.!ubuntu_25)::
23+
debian.(!debian_13.!debian_12.!ubuntu_22.!ubuntu_24.!ubuntu_25.!ubuntu_26)::
2424
"python" comment => "debian>=12 and ubuntu>=22 only has python3";
2525

2626
debian.(!debian_9.!debian_10.!debian_11.!ubuntu_20.!ubuntu_18.!ubuntu_16)::

ci/setup-cfengine-build-host.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,13 @@ function cleanup()
6060
set -ex
6161
if command -v apt 2>/dev/null; then
6262
# workaround for CFE-4544, remove scriptlets call systemctl even when systemctl is-system-running returns false
63-
rm /bin/systemctl
64-
ln -s /bin/echo /bin/systemctl
63+
# Replace systemctl with a no-op stub that always succeeds. We can't
64+
# symlink to /bin/echo (or /bin/true): on Ubuntu 26 coreutils is the
65+
# single multi-call uutils binary that dispatches on argv[0], so it
66+
# would fail with "coreutils: unknown program 'systemctl'".
67+
rm -f /bin/systemctl
68+
printf '#!/bin/sh\nexit 0\n' > /bin/systemctl
69+
chmod +x /bin/systemctl
6570
apt remove -y cfengine-nova || true
6671
elif command -v yum 2>/dev/null; then
6772
yum erase -y cfengine-nova || true

0 commit comments

Comments
 (0)