Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef5110f authored by Ibrahim Kanouche's avatar Ibrahim Kanouche
Browse files

Fixed typos and naming for SPDX validation 

Test: m compliance_sbom
Change-Id: I39edb73e11afc9050a2481a899b19f8f10eb7e72
parent 854afb66

tools/compliance/cmd/sbom/sbom.go

+4 −4
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ func sbomGenerator(ctx *context, files ...string) ([]string, error) { 
			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 @@ func sbomGenerator(ctx *context, files ...string) ([]string, error) { 
			}()

			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]

tools/compliance/cmd/sbom/sbom_test.go

+54 −60

File changed.

Preview size limit exceeded, changes collapsed.