clearlinux/mixer-tools
2
0
Fork 0
mirror of https://github.com/clearlinux/mixer-tools.git synced 2026-09-05 21:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset name from manifest based on modifiers

Browse Source 
If the modifiers of a file indicate it came from a chroot path, reset
the filename to use the chroot path when reading the file information
from a manifest.

Also ensure the only case files are marked as deleted is when it is
the SSE file. Other optimized files marked as deleted will be skipped
from being output in the manifest (and if the delete is new, the other
files with the same post processed path will be marked as new in the
version being built to ensure the deleted file is replaced).

Signed-off-by: William Douglas <william.douglas@intel.com>
This commit is contained in:
William Douglas
2023-04-24 07:33:45 -07:00
committed by William Douglas
parent 699bf8c86d
commit 244c9fb554
4 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
swupd/files.go
+11
View File
@@ -82,6 +82,17 @@ const (
AVX512_3
)
var modifierPrefixes = map[ModifierFlag]string{
SSE_0: "",
SSE_1: "",
SSE_2: "",
SSE_3: "",
AVX2_1: "/V3",
AVX2_3: "/V3",
AVX512_2: "/V4",
AVX512_3: "/V4",
}
// The three maps below were generated using the following:
// a := ".acdefghijklmnopqrtuvwxyzABDEFGHIJKLMNOPQRSTUVWXYZ0123456789!#^*"
swupd/heuristics.go
+4
View File
@@ -31,6 +31,10 @@ func (f *File) setModifierFromPathname() {
}
}
func (f *File) setPrefixFromModifier() {
f.Name = modifierPrefixes[f.Modifier] + f.Name
}
func (f *File) setFullModifier(bits uint64) {
switch f.Modifier {
case SSE_0:
swupd/manifest.go
+20 -3
View File
@@ -170,6 +170,9 @@ func readManifestFileEntry(fields []string, m *Manifest) error {
return nil
}
// Reset the file prefix back what is in the chroot
file.setPrefixFromModifier()
// add file to manifest
m.Files = append(m.Files, file)
@@ -300,12 +303,17 @@ func (m *Manifest) removeOptNonFiles() {
seen := make(map[string]bool)
i := 0
for _, f := range m.Files {
if f.Type == TypeFile || !(strings.HasPrefix(f.Name, "/V3") || strings.HasPrefix(f.Name, "/V4")) {
if f.Type == TypeFile || f.Type == TypeUnset || !(strings.HasPrefix(f.Name, "/V3") || strings.HasPrefix(f.Name, "/V4")) {
if f.Status == StatusDeleted {
if result := seen[f.Name]; result != false {
if strings.HasPrefix(f.Name, "/V3") || strings.HasPrefix(f.Name, "/V4") {
// for non-SSE deleted files the versions on matching files need bumping
// so update will replace the deleted optimized file.
// Track these files for later
strippedName := strings.TrimPrefix(f.Name, "/V3")
strippedName = strings.TrimPrefix(strippedName, "/V4")
seen[strippedName] = true
continue
}
seen[f.Name] = true
}
m.Files[i] = f
i++
@@ -315,6 +323,15 @@ func (m *Manifest) removeOptNonFiles() {
m.Files[j] = nil
}
m.Files = m.Files[:i]
for _, f := range m.Files {
strippedName := strings.TrimPrefix(f.Name, "/V3")
strippedName = strings.TrimPrefix(strippedName, "/V4")
// Only SSE content or non-deleted optimized files should be added to the filelist
if result := seen[strippedName]; result {
// Now update any versions for matching files of newly deleted optimized files
f.Version = m.Header.Version
}
}
}
func (m *Manifest) setupModifiers() error {
swupd/manifest_test.go
+46 -18
View File
@@ -169,9 +169,9 @@ func TestReadManifestHeaderOptional(t *testing.T) {
func TestReadManifestFileEntry(t *testing.T) {
validHash := "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
validManifestLines := [][]string{
{"Fdar", validHash, "10", "/usr/testfile"},
{"Fgcr", validHash, "100", "/usr/bin/test"},
{"Dddr", validHash, "99990", "/"},
{"Fdar", validHash, "10", "/usr/testfile", ""},
{"Fger", validHash, "100", "/usr/bin/test", "/V3"},
{"Ddgr", validHash, "99990", "/", "/V4"},
}
t.Run("valid", func(t *testing.T) {
@@ -182,7 +182,10 @@ func TestReadManifestFileEntry(t *testing.T) {
}
}
for _, f := range m.Files {
for i, f := range m.Files {
if f.Name != validManifestLines[i][4]+validManifestLines[i][3] {
t.Error("Failed to set filename from manifest line")
}
if f.Type == 0 || f.Status == 0 || f.Modifier == 0 || f.Misc == MiscUnset {
t.Error("failed to set flag from manifest line")
}
@@ -331,41 +334,50 @@ func TestWriteManifestFile(t *testing.T) {
}
func TestRemoveOptNonFiles(t *testing.T) {
testCases := []File {
testCases := []File{
{Name: "/V3/", Type: TypeLink},
{Name: "/V4", Type: TypeDirectory},
{Name: "/V4/usr/bin/f1", Type: TypeUnset, Status: StatusDeleted},
{Name: "/usr/bin/foo", Type: TypeUnset, Status: StatusDeleted},
{Name: "/usr/bin/foo", Type: TypeUnset, Status: StatusDeleted},
{Name: "/usr/bin/bar", Type: TypeUnset, Status: StatusDeleted},
{Name: "/usr/bin/f1", Type: TypeFile, Version: 10},
{Name: "/V3/usr/bin/f1", Type: TypeFile, Version: 10},
{Name: "/V3/usr/bin/file00", Type: TypeFile},
{Name: "/V4/usr/bin/file01", Type: TypeFile},
{Name: "/usr/bin/", Type: TypeDirectory},
}
m := Manifest{}
m.Header = ManifestHeader{}
m.Header.Version = 20
for i := range testCases {
m.Files = append(m.Files, &testCases[i])
}
m.removeOptNonFiles()
if len(m.Files) != 4 {
if len(m.Files) != 7 {
t.Fatalf("Manifest files incorrectly pruned")
}
for i := range m.Files {
if m.Files[i].Name != testCases[i+3].Name {
t.Errorf("Manifest file incorrectly pruned, expected: %v | actual: %v",
testCases[i+2].Name, m.Files[i].Name)
testCases[i+3].Name, m.Files[i].Name)
}
if m.Files[i].Version == 10 {
t.Errorf("Manifest file %v missing version update, expected 20",
m.Files[i])
}
}
}
func TestSetupModifiers(t *testing.T) {
testCases := []struct {
file File
expectedName string
file File
expectedName string
expectedModifier ModifierFlag
expectedMisc MiscFlag
expectedStatus StatusFlag
used bool
skipped bool
expectedMisc MiscFlag
expectedStatus StatusFlag
used bool
skipped bool
}{
{File{Name: "/usr/bin", Type: TypeDirectory, Misc: MiscExportFile, Status: StatusExperimental}, "/usr/bin", SSE_0, MiscExportFile, StatusExperimental, false, false},
{File{Name: "/V3/usr/bin", Type: TypeDirectory}, "/usr/bin", AVX2_1, MiscUnset, StatusUnset, false, true},
@@ -379,7 +391,15 @@ func TestSetupModifiers(t *testing.T) {
{File{Name: "/V4/usr/bin/file02", Type: TypeFile, Modifier: AVX512_2}, "/usr/bin/file02", AVX512_2, MiscExportFile, StatusExperimental, false, false},
{File{Name: "/V4/usr/bin/file03", Type: TypeFile, Modifier: AVX512_2}, "/usr/bin/file03", AVX512_3, MiscExportFile, StatusExperimental, false, false},
}
testCaseMap := make(map[string][]struct{file File; expectedName string; expectedModifier ModifierFlag; expectedMisc MiscFlag; expectedStatus StatusFlag; used bool; skipped bool})
testCaseMap := make(map[string][]struct {
file File
expectedName string
expectedModifier ModifierFlag
expectedMisc MiscFlag
expectedStatus StatusFlag
used bool
skipped bool
})
for _, tc := range testCases {
testCaseMap[tc.expectedName] = append(testCaseMap[tc.expectedName], tc)
}
@@ -391,14 +411,22 @@ func TestSetupModifiers(t *testing.T) {
m.setupModifiers()
for _, f := range m.Files {
var tcs []struct{file File; expectedName string; expectedModifier ModifierFlag; expectedMisc MiscFlag; expectedStatus StatusFlag; used bool; skipped bool}
var tcs []struct {
file File
expectedName string
expectedModifier ModifierFlag
expectedMisc MiscFlag
expectedStatus StatusFlag
used bool
skipped bool
}
var errb bool
if tcs, errb = testCaseMap[f.Name]; errb == false {
t.Errorf("Error fixing up filenames for %v", f.Name)
}
found := false
for i := range tcs {
if f.Modifier == tcs[i].expectedModifier && f.Misc == tcs[i].expectedMisc && f.Status == tcs[i].expectedStatus{
if f.Modifier == tcs[i].expectedModifier && f.Misc == tcs[i].expectedMisc && f.Status == tcs[i].expectedStatus {
found = true
tcs[i].used = true
}
@@ -419,7 +447,7 @@ func TestSetupModifiers(t *testing.T) {
}
func TestSetupModifiersMissingSSE(t *testing.T) {
testCases := []File {
testCases := []File{
{Name: "/V3/usr/bin/file00", Type: TypeFile, Modifier: AVX2_1},
{Name: "/V4/usr/bin/file01", Type: TypeFile, Modifier: AVX512_2},
}