chore: document build the enabled task.

This commit is contained in:
Alexandre Pujol 2024-10-04 16:14:40 +01:00
parent 18a71512a9
commit 4b5f7f2b52
Failed to generate hash of commit
3 changed files with 14 additions and 27 deletions

View file

@ -20,18 +20,18 @@ func init() {
// Define the tasks applied by default // Define the tasks applied by default
prepare.Register( prepare.Register(
"synchronise", "synchronise", // Initialize a new clean apparmor.d build directory
"ignore", "ignore", // Ignore profiles and files from dist/ignore
"merge", "merge", // Merge profiles (from group/, profiles-*-*/) to a unified apparmor.d directory
"configure", "configure", // Set distribution specificities
"setflags", "setflags", // Set flags as definied in dist/flags
"overwrite", "overwrite", // Overwrite dummy upstream profiles
"systemd-default", "systemd-default", // Set systemd unit drop in files for dbus profiles
) )
// Build tasks applied by default // Build tasks applied by default
builder.Register( builder.Register(
"userspace", // Resolve variable in the userspace profile "userspace", // Resolve variable in the userspace profile
"dev", // Temporary fix for #74, #80 & #235 "dev", // Temporary fix for #74, #80 & #235
) )
@ -65,9 +65,6 @@ func init() {
/etc/apparmor.d/whonix-firewall /etc/apparmor.d/whonix-firewall
` `
} }
if prebuild.ABI == 3 {
builder.Register("abi3")
}
} }
func main() { func main() {

View file

@ -86,21 +86,11 @@ func Prebuild() {
builder.Register("enforce") builder.Register("enforce")
} }
switch abi { if abi != nilABI {
case 3: prebuild.ABI = abi
prebuild.ABI = 3 }
builder.Register("abi3") if prebuild.ABI == 3 {
case 4: builder.Register("abi3") // Convert all profiles from abi 4.0 to abi 3.0
prebuild.ABI = 4
for i, b := range builder.Builds {
if b.Name() == "abi3" {
builder.Builds = append(builder.Builds[:i], builder.Builds[i+1:]...)
break
}
}
case nilABI:
default:
logging.Fatal("ABI %d not supported", abi)
} }
if file != "" { if file != "" {

View file

@ -20,7 +20,7 @@ func init() {
RegisterTask(&Merge{ RegisterTask(&Merge{
Base: prebuild.Base{ Base: prebuild.Base{
Keyword: "merge", Keyword: "merge",
Msg: "Merge all profiles into a unified apparmor.d directory", Msg: "Merge profiles (from group/, profiles-*-*/) to a unified apparmor.d directory",
}, },
}) })
} }