mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-11-14 23:43:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: set default ABI to abi4.

Browse Source
This commit is contained in:
Alexandre Pujol 2024-10-02 16:44:15 +01:00
parent 59ac54e2fc
commit 344ccf3003
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/prebuild/main.go
View File

@ -13,7 +13,11 @@ import (
"github.com/roddhjav/apparmor.d/pkg/prebuild/prepare" "github.com/roddhjav/apparmor.d/pkg/prebuild/prepare"
) )
// Cli arguments have priority over the settings entered here
func init() { func init() {
// Define the default ABI
prebuild.ABI = 4
// Define the tasks applied by default // Define the tasks applied by default
prepare.Register( prepare.Register(
"synchronise", "synchronise",

2
pkg/prebuild/cli/cli.go
View File

@ -72,7 +72,6 @@ func Prebuild() {
flag.Usage() flag.Usage()
return return
} }
logging.Step("Building apparmor.d profiles for %s.", prebuild.Distribution)
if full { if full {
prepare.Register("fsp") prepare.Register("fsp")
@ -111,6 +110,7 @@ func Prebuild() {
configure.OneFile = true configure.OneFile = true
} }
logging.Step("Building apparmor.d profiles for %s on ABI%d.", prebuild.Distribution, prebuild.ABI)
if err := Prepare(); err != nil { if err := Prepare(); err != nil {
logging.Fatal("%s", err.Error()) logging.Fatal("%s", err.Error())
} }

2
pkg/prebuild/directive/core.go
View File

@ -30,7 +30,7 @@ type Directive interface {
} }
func Usage() string { func Usage() string {
res := fmt.Sprintf("Directive:\n") res := "Directive:\n"
for _, d := range Directives { for _, d := range Directives {
for _, h := range d.Usage() { for _, h := range d.Usage() {
res += fmt.Sprintf(" %s%s %s\n", Keyword, d.Name(), h) res += fmt.Sprintf(" %s%s %s\n", Keyword, d.Name(), h)