Skip to content
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

Jump to bottom

Fix librpm installation in auditbeat build #21239

Merged
merged 5 commits into from
Sep 24, 2020
Merged

Fix librpm installation in auditbeat build #21239

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a920de6
Remove librpm installation from auditbeat build
jsoriano Sep 23, 2020
359c0a9
Revert "Remove librpm installation from auditbeat build"
jsoriano Sep 23, 2020
b206531
Remove installation of librpm-dev only for armv7
jsoriano Sep 23, 2020
3d68864
Force installation of some librpm-dev dependencies in arm architectures
jsoriano Sep 23, 2020
f04548d
Typos
jsoriano Sep 23, 2020
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
50 changes: 29 additions & 21 deletions x-pack/auditbeat/magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ var (
"linux/386": installLinux386,
"linux/amd64": installLinuxAMD64,
"linux/arm64": installLinuxARM64,
"linux/armv5": installLinuxARMLE,
"linux/armv6": installLinuxARMLE,
"linux/armv5": installLinuxARMEL,
"linux/armv6": installLinuxARMEL,
"linux/armv7": installLinuxARMHF,
"linux/mips": installLinuxMIPS,
"linux/mipsle": installLinuxMIPSLE,
"linux/mips64le": installLinuxMIPS64LE,
"linux/ppc64le": installLinuxPPC64LE,
"linux/mipsle": installLinuxMIPSEL,
"linux/mips64le": installLinuxMIPS64EL,
"linux/ppc64le": installLinuxPPC64EL,
"linux/s390x": installLinuxS390X,

//"linux/ppc64": installLinuxPpc64,
Expand All @@ -148,49 +148,56 @@ var (

const (
librpmDevPkgName = "librpm-dev"

// Dependency of librpm-dev in ARM architectures, that needs to be explicitly
// installed to replace other conflicting packages pre-installed in the image.
libicuDevPkgName = "libicu-dev"
)

func installLinuxAMD64() error {
return installDependencies(librpmDevPkgName, "")
return installDependencies("", librpmDevPkgName)
}

func installLinuxARM64() error {
return installDependencies(librpmDevPkgName+":arm64", "arm64")
return installDependencies("arm64", librpmDevPkgName+":arm64")
}

func installLinuxARMHF() error {
return installDependencies(librpmDevPkgName+":armhf", "armhf")
return installDependencies("armhf", librpmDevPkgName+":armhf", libicuDevPkgName+":armhf")
}

func installLinuxARMLE() error {
return installDependencies(librpmDevPkgName+":armel", "armel")
func installLinuxARMEL() error {
return installDependencies("armel", librpmDevPkgName+":armel", libicuDevPkgName+":armel")
}

func installLinux386() error {
return installDependencies(librpmDevPkgName+":i386", "i386")
return installDependencies("i386", librpmDevPkgName+":i386")
}

func installLinuxMIPS() error {
return installDependencies(librpmDevPkgName+":mips", "mips")
return installDependencies("mips", librpmDevPkgName+":mips")
}

func installLinuxMIPS64LE() error {
return installDependencies(librpmDevPkgName+":mips64el", "mips64el")
func installLinuxMIPS64EL() error {
return installDependencies("mips64el", librpmDevPkgName+":mips64el")
}

func installLinuxMIPSLE() error {
return installDependencies(librpmDevPkgName+":mipsel", "mipsel")
func installLinuxMIPSEL() error {
return installDependencies("mispel", librpmDevPkgName+":mipsel")
}

func installLinuxPPC64LE() error {
return installDependencies(librpmDevPkgName+":ppc64el", "ppc64el")
func installLinuxPPC64EL() error {
return installDependencies("ppc64el", librpmDevPkgName+":ppc64el")
}

func installLinuxS390X() error {
return installDependencies(librpmDevPkgName+":s390x", "s390x")
return installDependencies("s390x", librpmDevPkgName+":s390x")
}

func installDependencies(pkg, arch string) error {
func installDependencies(arch string, pkgs ...string) error {
if len(pkgs) == 0 {
return nil
}
if arch != "" {
err := sh.Run("dpkg", "--add-architecture", arch)
if err != nil {
Expand All @@ -206,5 +213,6 @@ func installDependencies(pkg, arch string) error {
return err
}

return sh.Run("apt-get", "install", "-y", "--no-install-recommends", pkg)
args := append([]string{"install", "-y", "--no-install-recommends"}, pkgs...)
return sh.Run("apt-get", args...)
}