diff --git a/pkg/erofs/erofs.go b/pkg/erofs/erofs.go index e488013..340427e 100644 --- a/pkg/erofs/erofs.go +++ b/pkg/erofs/erofs.go @@ -111,7 +111,7 @@ func MakeErofs(tempdir string, rootfs string, eps *common.ExcludePaths, verity v return nil, "", rootHash, errors.WithStack(err) } - return blob, GenerateErofsMediaType(compression, verity), rootHash, nil + return blob, GenerateErofsMediaType(compression), rootHash, nil } func findErofsFuseInfo() { diff --git a/pkg/erofs/mediatype.go b/pkg/erofs/mediatype.go index e6975a1..289e32e 100644 --- a/pkg/erofs/mediatype.go +++ b/pkg/erofs/mediatype.go @@ -3,8 +3,6 @@ package erofs import ( "fmt" "strings" - - vrty "machinerun.io/atomfs/pkg/verity" ) type ErofsCompression string @@ -21,10 +19,6 @@ func IsErofsMediaType(mediaType string) bool { return strings.HasPrefix(mediaType, BaseMediaTypeLayerErofs) } -func GenerateErofsMediaType(comp ErofsCompression, verity vrty.VerityMetadata) string { - verityString := "" - if verity { - verityString = fmt.Sprintf("+%s", vrty.VeritySuffix) - } - return fmt.Sprintf("%s+%s%s", BaseMediaTypeLayerErofs, comp, verityString) +func GenerateErofsMediaType(comp ErofsCompression) string { + return fmt.Sprintf("%s+%s", BaseMediaTypeLayerErofs, comp) } diff --git a/pkg/squashfs/mediatype.go b/pkg/squashfs/mediatype.go index e1e007f..39ae9f8 100644 --- a/pkg/squashfs/mediatype.go +++ b/pkg/squashfs/mediatype.go @@ -3,8 +3,6 @@ package squashfs import ( "fmt" "strings" - - vrty "machinerun.io/atomfs/pkg/verity" ) type SquashfsCompression string @@ -20,10 +18,6 @@ func IsSquashfsMediaType(mediaType string) bool { return strings.HasPrefix(mediaType, BaseMediaTypeLayerSquashfs) } -func GenerateSquashfsMediaType(comp SquashfsCompression, verity vrty.VerityMetadata) string { - verityString := "" - if verity { - verityString = fmt.Sprintf("+%s", vrty.VeritySuffix) - } - return fmt.Sprintf("%s+%s%s", BaseMediaTypeLayerSquashfs, comp, verityString) +func GenerateSquashfsMediaType(comp SquashfsCompression) string { + return fmt.Sprintf("%s+%s", BaseMediaTypeLayerSquashfs, comp) } diff --git a/pkg/squashfs/squashfs.go b/pkg/squashfs/squashfs.go index 50b574c..ba41354 100644 --- a/pkg/squashfs/squashfs.go +++ b/pkg/squashfs/squashfs.go @@ -105,7 +105,7 @@ func MakeSquashfs(tempdir string, rootfs string, eps *common.ExcludePaths, verit return nil, "", rootHash, errors.WithStack(err) } - return blob, GenerateSquashfsMediaType(compression, verity), rootHash, nil + return blob, GenerateSquashfsMediaType(compression), rootHash, nil } func findSquashFuseInfo() {