Fixed typos and naming for SPDX validation
Test: m compliance_sbom
Change-Id: I39edb73e11afc9050a2481a899b19f8f10eb7e72
diff --git a/tools/compliance/cmd/sbom/sbom.go b/tools/compliance/cmd/sbom/sbom.go
index e031052..0f8a876 100644
--- a/tools/compliance/cmd/sbom/sbom.go
+++ b/tools/compliance/cmd/sbom/sbom.go
@@ -343,9 +343,9 @@
if isMainPackage {
mainPackage = getDocumentName(ctx, tn, pm)
fmt.Fprintf(ctx.stdout, "SPDXVersion: SPDX-2.2\n")
- fmt.Fprintf(ctx.stdout, "DataLicense: CC-1.0\n")
+ fmt.Fprintf(ctx.stdout, "DataLicense: CC0-1.0\n")
fmt.Fprintf(ctx.stdout, "DocumentName: %s\n", mainPackage)
- fmt.Fprintf(ctx.stdout, "SPDXID: SPDXRef-DOCUMENT-%s\n", mainPackage)
+ fmt.Fprintf(ctx.stdout, "SPDXID: SPDXRef-DOCUMENT\n")
fmt.Fprintf(ctx.stdout, "DocumentNamespace: Android\n")
fmt.Fprintf(ctx.stdout, "Creator: Organization: Google LLC\n")
fmt.Fprintf(ctx.stdout, "Created: %s\n", ctx.creationTime().Format("2006-01-02T15:04:05Z"))
@@ -363,8 +363,8 @@
}()
if len(path) == 0 {
relationships = append(relationships,
- fmt.Sprintf("Relationship: SPDXRef-DOCUMENT-%s DESCRIBES SPDXRef-Package-%s",
- mainPackage, getPackageName(ctx, tn)))
+ fmt.Sprintf("Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-Package-%s",
+ getPackageName(ctx, tn)))
} else {
// Check parent and identify annotation
parent := path[len(path)-1]