build: set default ABI to abi4.

cmd/prebuild/main.go

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

pkg/prebuild/cli/cli.go

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

pkg/prebuild/directive/core.go

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