Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build-scripts/labels.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ PACKAGES_HUB_x86_64_linux_ubuntu_22
PACKAGES_HUB_arm_64_linux_ubuntu_22
PACKAGES_HUB_x86_64_linux_ubuntu_24
PACKAGES_HUB_arm_64_linux_ubuntu_24
PACKAGES_HUB_x86_64_linux_ubuntu_26
PACKAGES_HUB_arm_64_linux_ubuntu_26

PACKAGES_x86_64_linux_debian_12
PACKAGES_arm_64_linux_debian_12
Expand All @@ -32,5 +34,7 @@ PACKAGES_x86_64_linux_ubuntu_22
PACKAGES_arm_64_linux_ubuntu_22
PACKAGES_x86_64_linux_ubuntu_24
PACKAGES_arm_64_linux_ubuntu_24
PACKAGES_x86_64_linux_ubuntu_26
PACKAGES_arm_64_linux_ubuntu_26

PACKAGES_x86_64_mingw
2 changes: 1 addition & 1 deletion ci/cfengine-build-host-setup.cf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bundle agent cfengine_build_host_setup

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

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

debian.(!debian_9.!debian_10.!debian_11.!ubuntu_20.!ubuntu_18.!ubuntu_16)::
Expand Down
9 changes: 7 additions & 2 deletions ci/setup-cfengine-build-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@ function cleanup()
set -ex
if command -v apt 2>/dev/null; then
# workaround for CFE-4544, remove scriptlets call systemctl even when systemctl is-system-running returns false
rm /bin/systemctl
ln -s /bin/echo /bin/systemctl
# Replace systemctl with a no-op stub that always succeeds. We can't
# symlink to /bin/echo (or /bin/true): on Ubuntu 26 coreutils is the
# single multi-call uutils binary that dispatches on argv[0], so it
# would fail with "coreutils: unknown program 'systemctl'".
rm -f /bin/systemctl
printf '#!/bin/sh\nexit 0\n' > /bin/systemctl
chmod +x /bin/systemctl
apt remove -y cfengine-nova || true
elif command -v yum 2>/dev/null; then
yum erase -y cfengine-nova || true
Expand Down