Skip to content

Commit

Permalink
Switch crossbuilding to Debian 11 (#41402) (#41416)
Browse files Browse the repository at this point in the history
We're dropping support for Debian 10, so no need to crossbuild using
the outdated image anymore.

The old linker in Debian 10 caused a packaging issue with some Go
dependency updates #41270

So, this update should also help with that.

This also updates the statically linked glibc from 2.28 to 2.31.

(cherry picked from commit 4140d15)

Co-authored-by: Denis <[email protected]>
  • Loading branch information
mergify[bot] and rdner authored Oct 24, 2024
1 parent f0cc4e3 commit 4550165
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Beats won't log start up information when running under the Elastic Agent {40390}40390[40390]
- Filebeat now needs `dup3`, `faccessat2`, `prctl` and `setrlimit` syscalls to run the journald input. If this input is not being used, the syscalls are not needed. All Beats have those syscalls allowed now because the default seccomp policy is global to all Beats. {pull}40061[40061]
- Beats will rate limit the logs about errors when indexing events on Elasticsearch, logging a summary every 10s. The logs sent to the event log is unchanged. {issue}40157[40157]
- Drop support for Debian 10 and upgrade statically linked glibc from 2.28 to 2.31 {pull}41402[41402]

*Auditbeat*

Expand Down
14 changes: 7 additions & 7 deletions dev-tools/mage/crossbuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ func CrossBuildImage(platform string) (string, error) {

switch {
case platform == "darwin/amd64":
tagSuffix = "darwin-debian10"
tagSuffix = "darwin-debian11"
case platform == "darwin/arm64":
tagSuffix = "darwin-arm64-debian10"
tagSuffix = "darwin-arm64-debian11"
case platform == "darwin/universal":
tagSuffix = "darwin-arm64-debian10"
tagSuffix = "darwin-arm64-debian11"
case platform == "linux/arm64":
tagSuffix = "arm"
case platform == "linux/armv5":
Expand All @@ -235,13 +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"):
tagSuffix = "main-debian10"
tagSuffix = "main-debian11"
}

goVersion, err := GoVersion()
Expand Down

0 comments on commit 4550165

Please sign in to comment.