Disable journald input build from filebeat (elastic#19680)

urso · Jul 6, 2020 · efa5eba · efa5eba
1 parent a820842
commit efa5eba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/filebeat/input/journald/config.go b/filebeat/input/journald/config.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// +build linux,cgo
+// +build linux,cgo,withjournald
 
 package journald
 

diff --git a/filebeat/input/journald/conv.go b/filebeat/input/journald/conv.go
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// +build linux,cgo,withjournald
+
 package journald
 
 import (

diff --git a/filebeat/input/journald/input.go b/filebeat/input/journald/input.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// +build linux,cgo
+// +build linux,cgo,withjournald
 
 package journald
 

diff --git a/filebeat/magefile.go b/filebeat/magefile.go
@@ -49,9 +49,9 @@ var (
 		devtools.LinuxS390x,
 	}
 
-	deps = devtools.NewPackageInstaller().
-		AddEach(journaldPlatforms, "libsystemd-dev").
-		Add(devtools.Linux386, "libsystemd0", "libgcrypt20")
+	journaldDeps = devtools.NewPackageInstaller().
+			AddEach(journaldPlatforms, "libsystemd-dev").
+			Add(devtools.Linux386, "libsystemd0", "libgcrypt20")
 )
 
 func init() {
@@ -69,7 +69,9 @@ func Build() error {
 // GolangCrossBuild build the Beat binary inside of the golang-builder.
 // Do not use directly, use crossBuild instead.
 func GolangCrossBuild() error {
-	mg.Deps(deps.Installer(devtools.Platform.Name))
+	// XXX: enable once we have systemd available in the cross build image
+	// mg.Deps(journaldDeps.Installer(devtools.Platform.Name))
+
 	return devtools.GolangCrossBuild(devtools.DefaultGolangCrossBuildArgs())
 }