Skip to content

[8.7](backport #34939) filebeat/scripts/mage - Remove installation of journald deps from crossBuild #34954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewkroh merged 1 commit into from
Mar 28, 2023
Merged

[8.7](backport #34939) filebeat/scripts/mage - Remove installation of journald deps from crossBuild #34954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions filebeat/scripts/mage/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,11 @@ package mage
import (
"strings"

"github.com/magefile/mage/mg"
"go.uber.org/multierr"

devtools "github.com/elastic/beats/v7/dev-tools/mage"
)

// declare journald dependencies for cross build target
var (
journaldPlatforms = []devtools.PlatformDescription{
devtools.Linux386, devtools.LinuxAMD64,
devtools.LinuxARM64, devtools.LinuxARM5, devtools.LinuxARM6, devtools.LinuxARM7,
devtools.LinuxMIPS, devtools.LinuxMIPSLE, devtools.LinuxMIPS64LE,
devtools.LinuxPPC64LE,
devtools.LinuxS390x,
}

journaldDeps = devtools.NewPackageInstaller().
AddEach(journaldPlatforms, "libsystemd-dev").
Add(devtools.Linux386, "libsystemd0", "libgcrypt20")
)

// GolangCrossBuild builds the Beat binary inside the golang-builder and then
// checks the binaries GLIBC requirements for RHEL compatability.
// Do not use directly, use crossBuild instead.
Expand All @@ -57,7 +41,6 @@ func GolangCrossBuild() error {
func golangCrossBuild() error {
conf := devtools.DefaultGolangCrossBuildArgs()
if devtools.Platform.GOOS == "linux" {
mg.Deps(journaldDeps.Installer(devtools.Platform.Name))
conf.ExtraFlags = append(conf.ExtraFlags, "-tags=withjournald")
}
return devtools.GolangCrossBuild(conf)
Expand Down