Add new distro

Author: cdupuis

sbom/syft.go

@@ -377,11 +377,20 @@ func osQualifiers(release *linux.Release) (types.Distro, map[string]string) {
 		distro.OsDistro = release.VersionCodename
 	}
 
-	qualifiers["os_name"] = distro.OsName
-	qualifiers["os_version"] = distro.OsVersion
-	if distro.OsDistro != "" {
-		qualifiers["os_distro"] = distro.OsDistro
+	// special handling for wolfi images
+	if distro.OsName == "wolfi" {
+		qualifiers["os_name"] = "alpine"
+		qualifiers["os_version"] = "edge"
+		qualifiers["distro_name"] = distro.OsName
+		qualifiers["distro_version"] = distro.OsVersion
+	} else {
+		qualifiers["os_name"] = distro.OsName
+		qualifiers["os_version"] = distro.OsVersion
+		if distro.OsDistro != "" {
+			qualifiers["os_distro"] = distro.OsDistro
+		}
 	}
+
 	return distro, qualifiers
 }
 

types/purl.go

@@ -55,6 +55,12 @@ func NormalizePackages(pkgs []Package) ([]Package, error) {
 			if d := q["os_distro"]; d != "" {
 				qualifiers["os_distro"] = d
 			}
+			if d := q["distro_name"]; d != "" {
+				qualifiers["distro_name"] = d
+			}
+			if d := q["distro_version"]; d != "" {
+				qualifiers["distro_version"] = d
+			}
 			purl.Qualifiers = packageurl.QualifiersFromMap(qualifiers)
 		}