Skip to content

filebeat/scripts/mage - Remove installation of journald deps from crossBuild #34939

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 2 commits into from
Mar 28, 2023
Merged

filebeat/scripts/mage - Remove installation of journald deps from crossBuild #34939

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33fbe01
filebeat/scripts/mage - Remove installation of journald deps from cro…
andrewkroh Mar 27, 2023
9d2d062
undo simplification of CrossBuild function
andrewkroh Mar 28, 2023
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
19 changes: 1 addition & 18 deletions filebeat/scripts/mage/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,11 @@
package mage

import (
"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 compatibility.
// Do not use directly, use crossBuild instead.
Expand All @@ -55,13 +39,12 @@ 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)
}

// CrossBuild cross-builds the beat for all target platforms.
func CrossBuild() error {
return devtools.CrossBuild(devtools.ImageSelector(devtools.CrossBuildImage))
return devtools.CrossBuild()
}