From a264cd1e34683150cc74f74404eb066809bde654 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 13 Jun 2025 18:52:07 -0400 Subject: [PATCH] Explicitly crossbuild linux/arm with debian11. (#8497) * Explicitly crossbuild linux/arm with debian11. * Add changelog. * Tidy changelog. (cherry picked from commit 8b3a557277fd0c3a255265d16fc1dfce82288892) --- ...11-for-linux-arm-to-match-linux-amd64.yaml | 32 +++++++++++++++++++ dev-tools/mage/crossbuild.go | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 changelog/fragments/1749844873-Use-Debian-11-for-linux-arm-to-match-linux-amd64.yaml diff --git a/changelog/fragments/1749844873-Use-Debian-11-for-linux-arm-to-match-linux-amd64.yaml b/changelog/fragments/1749844873-Use-Debian-11-for-linux-arm-to-match-linux-amd64.yaml new file mode 100644 index 00000000000..a0727e01a93 --- /dev/null +++ b/changelog/fragments/1749844873-Use-Debian-11-for-linux-arm-to-match-linux-amd64.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: bug-fix + +# Change summary; a 80ish characters long description of the change. +summary: Use Debian 11 to build linux/arm to match linux/amd64. Upgrades linux/arm64's statically linked glibc from 2.28 to 2.31. + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +#description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: "elastic-agent" + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +pr: https://github.com/elastic/elastic-agent/pull/8497 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +#issue: https://github.com/owner/repo/1234 diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index 20ee3e3e1e0..eb18acfb422 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -229,7 +229,7 @@ func CrossBuildImage(platform string) (string, error) { case platform == "darwin/arm64" || platform == "darwin/universal": tagSuffix = "darwin-arm64-debian11" case platform == "linux/arm64": - tagSuffix = "base-arm-debian9" + tagSuffix = "base-arm-debian11" case platform == "linux/armv5" || platform == "linux/armv6": tagSuffix = "armel" case platform == "linux/armv7":