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

build: use golang CopyFS

Browse source 
- speed up prebuild sync tasks.
This commit is contained in:
Alexandre Pujol 2025-04-05 00:28:04 +02:00
parent 4d3025e249
commit 2c3380f9ba
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ package prepare
import ( import (
"fmt" "fmt"
"github.com/roddhjav/apparmor.d/pkg/paths"
"github.com/roddhjav/apparmor.d/pkg/prebuild" "github.com/roddhjav/apparmor.d/pkg/prebuild"
) )
@ -36,7 +35,7 @@ func (p Configure) Apply() ([]string, error) {
} }
if prebuild.Version < 3.0 { if prebuild.Version < 3.0 {
if err := paths.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil { if err := prebuild.DistDir.Join("ubuntu").CopyFS(prebuild.RootApparmord); err != nil {
return res, err return res, err
} }
} }
@ -48,7 +47,7 @@ func (p Configure) Apply() ([]string, error) {
if prebuild.Version < 4.1 { if prebuild.Version < 4.1 {
// Copy Debian specific abstractions // Copy Debian specific abstractions
if err := paths.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil { if err := prebuild.DistDir.Join("ubuntu").CopyFS(prebuild.RootApparmord); err != nil {
return res, err return res, err
} }
} }

4
pkg/prebuild/prepare/fsp.go
View file

@ -29,7 +29,7 @@ func (p FullSystemPolicy) Apply() ([]string, error) {
res := []string{} res := []string{}
// Install full system policy profiles // Install full system policy profiles
if err := paths.CopyTo(paths.New("apparmor.d/groups/_full/"), prebuild.Root.Join("apparmor.d")); err != nil { if err := paths.New("apparmor.d/groups/_full/").CopyFS(prebuild.Root.Join("apparmor.d")); err != nil {
return res, err return res, err
} }
@ -58,5 +58,5 @@ func (p FullSystemPolicy) Apply() ([]string, error) {
} }
// Set systemd unit drop-in files // Set systemd unit drop-in files
return res, paths.CopyTo(prebuild.SystemdDir.Join("full"), prebuild.Root.Join("systemd")) return res, prebuild.SystemdDir.Join("full").CopyFS(prebuild.Root.Join("systemd"))
} }

2
pkg/prebuild/prepare/synchronise.go
View file

@ -41,7 +41,7 @@ func (p Synchronise) Apply() ([]string, error) {
} }
if src.IsDir() { if src.IsDir() {
if err := paths.CopyTo(src, dst); err != nil { if err := src.CopyFS(dst); err != nil {
return res, err return res, err
} }
} else { } else {

5
pkg/prebuild/prepare/systemd.go
View file

@ -5,7 +5,6 @@
package prepare package prepare
import ( import (
"github.com/roddhjav/apparmor.d/pkg/paths"
"github.com/roddhjav/apparmor.d/pkg/prebuild" "github.com/roddhjav/apparmor.d/pkg/prebuild"
) )
@ -33,9 +32,9 @@ func init() {
} }
func (p SystemdDefault) Apply() ([]string, error) { func (p SystemdDefault) Apply() ([]string, error) {
return []string{}, paths.CopyTo(prebuild.SystemdDir.Join("default"), prebuild.Root.Join("systemd")) return []string{}, prebuild.SystemdDir.Join("default").CopyFS(prebuild.Root.Join("systemd"))
} }
func (p SystemdEarly) Apply() ([]string, error) { func (p SystemdEarly) Apply() ([]string, error) {
return []string{}, paths.CopyTo(prebuild.SystemdDir.Join("early"), prebuild.Root.Join("systemd")) return []string{}, prebuild.SystemdDir.Join("early").CopyFS(prebuild.Root.Join("systemd"))
} }