mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2025-01-18 08:58:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: add FlagDir variable in prebuild code.

Browse source
This commit is contained in:
Alexandre Pujol 2023-07-23 20:36:48 +01:00
parent 6325314825
commit c6a048c9ca
Failed to generate hash of commit
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/prebuild/prebuild.go
View file

@ -13,11 +13,13 @@ var (
DistDir *paths.Path DistDir *paths.Path
Root *paths.Path Root *paths.Path
RootApparmord *paths.Path RootApparmord *paths.Path
FlagDir *paths.Path
) )
func init() { func init() {
DistDir = paths.New("dists") DistDir = paths.New("dists")
Root = paths.New(".build") Root = paths.New(".build")
FlagDir = DistDir.Join("flags")
RootApparmord = Root.Join("apparmor.d") RootApparmord = Root.Join("apparmor.d")
Distribution = getSupportedDistribution() Distribution = getSupportedDistribution()
} }

2
pkg/prebuild/prepare.go
View file

@ -135,7 +135,7 @@ func Configure() (err error) {
// Set flags on some profiles according to manifest defined in `dists/flags/` // Set flags on some profiles according to manifest defined in `dists/flags/`
func SetFlags() error { func SetFlags() error {
for _, name := range []string{"main.flags", Distribution + ".flags"} { for _, name := range []string{"main.flags", Distribution + ".flags"} {
path := DistDir.Join("flags", name) path := FlagDir.Join(name)
if !path.Exist() { if !path.Exist() {
continue continue
} }