From 23024330d521d2db63c1b47636f9c30e4ea2d267 Mon Sep 17 00:00:00 2001 From: Denis Rechkunov Date: Thu, 24 Oct 2024 08:20:43 +0200 Subject: [PATCH] Switch crossbuilding to Debian 11 We're dropping support for Debian 10, so no need to crossbuild using the outdated image anymore. This also updates the statically linked glibc from 2.19 to 2.31. --- .../fragments/1729750939-crossbuild-debian11.yaml | 4 ++++ dev-tools/mage/crossbuild.go | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 changelog/fragments/1729750939-crossbuild-debian11.yaml diff --git a/changelog/fragments/1729750939-crossbuild-debian11.yaml b/changelog/fragments/1729750939-crossbuild-debian11.yaml new file mode 100644 index 00000000000..dd3b512f1df --- /dev/null +++ b/changelog/fragments/1729750939-crossbuild-debian11.yaml @@ -0,0 +1,4 @@ +kind: breaking-change +summary: crossbuild-debian11 +description: We're dropping support for Debian 10, so no need to crossbuild using the outdated image anymore. This also updates the statically linked glibc from 2.19 to 2.31. +component: elastic-agent diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index edb7c5c882a..30750602118 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -225,9 +225,9 @@ func CrossBuildImage(platform string) (string, error) { switch { case platform == "darwin/amd64": - tagSuffix = "darwin-debian10" + tagSuffix = "darwin-debian11" case platform == "darwin/arm64" || platform == "darwin/universal": - tagSuffix = "darwin-arm64-debian10" + tagSuffix = "darwin-arm64-debian11" case platform == "linux/arm64": tagSuffix = "arm" case platform == "linux/armv5" || platform == "linux/armv6": @@ -235,15 +235,13 @@ func CrossBuildImage(platform string) (string, error) { case platform == "linux/armv7": tagSuffix = "armhf" case strings.HasPrefix(platform, "linux/mips"): - tagSuffix = "mips-debian10" + tagSuffix = "mips-debian11" case strings.HasPrefix(platform, "linux/ppc"): - tagSuffix = "ppc-debian10" + tagSuffix = "ppc-debian11" case platform == "linux/s390x": - tagSuffix = "s390x-debian10" + tagSuffix = "s390x-debian11" case strings.HasPrefix(platform, "linux"): - // Use an older version of libc to gain greater OS compatibility. - // Debian 8 uses glibc 2.19. - tagSuffix = "main-debian8" + tagSuffix = "main-debian11" } goVersion, err := GoVersion()