felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: move upstream overwrite to its own build tasks.

Browse source 
It allow us to controll when we want to do it and either or not it should be enabled.
This commit is contained in:
Alexandre Pujol 2024-10-03 11:55:33 +01:00
parent 896254c2ec
commit de21ff07a6
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
5 changed files with 76 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

41
pkg/prebuild/prepare/configure.go
View file

@ -6,7 +6,6 @@ package prepare
import (
"fmt"
"os"
"github.com/roddhjav/apparmor.d/pkg/prebuild"
"github.com/roddhjav/apparmor.d/pkg/util"
@ -14,7 +13,6 @@ import (
type Configure struct {
prebuild.Base
OneFile bool
}
func init() {
@ -23,18 +21,12 @@ func init() {
Keyword: "configure",
Msg: "Set distribution specificities",
},
OneFile: false,
})
}
func (p Configure) Apply() ([]string, error) {
res := []string{}
if prebuild.ABI == 4 {
if err := OverwriteUpstreamProfile(p.OneFile); err != nil {
return res, err
}
}
switch prebuild.Distribution {
case "arch", "opensuse":
@ -65,36 +57,3 @@ func (p Configure) Apply() ([]string, error) {
}
return res, nil
}
// Overwrite upstream profile: disable upstream & rename ours
func OverwriteUpstreamProfile(oneFile bool) error {
const ext = ".apparmor.d"
disableDir := prebuild.RootApparmord.Join("disable")
if err := disableDir.Mkdir(); err != nil {
return err
}
path := prebuild.DistDir.Join("overwrite")
if !path.Exist() {
return fmt.Errorf("%s not found", path)
}
for _, name := range util.MustReadFileAsLines(path) {
origin := prebuild.RootApparmord.Join(name)
dest := prebuild.RootApparmord.Join(name + ext)
if !dest.Exist() && oneFile {
continue
}
if err := origin.Rename(dest); err != nil {
return err
}
originRel, err := origin.RelFrom(dest)
if err != nil {
return err
}
if err := os.Symlink(originRel.String(), disableDir.Join(name).String()); err != nil {
return err
}
}
return nil
}