filebeat/scripts/mage - Remove installation of journald deps from cro…

…ssBuild (#34939) (#34953)

The golang-crossbuild images contain the journald development dependencies so
the build steps do not need make changes to the environment before building.

Fixes #34938

(cherry picked from commit 192be24)

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>

filebeat/scripts/mage/build.go

@@ -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.
@@ -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)