From 2ec463fa2f759a02cc6bf2305a0ad3a7c7f6f2e6 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Fri, 29 Aug 2025 16:49:00 +0200 Subject: [PATCH] package/go: fix CPE id This patch fixes the CPE ID for both go-bin and go-src packages. The go-src package did had a CPE ID because GO_SRC_CPE_ID_VENDOR is defined but the generated CPE ID would be the following: cpe:2.3:a:golang:go-src:*:*:*:*:*:*:*:* The CPE product go-src doesn't match to anything and should be 'go' instead. For go-bin no CPE_ID variable were defined so no CPE ID would be generated if using a pre-build toolchain. This patch duplicate the definition of the CPE_ID variables, I didn't put the definition in the 'package/go/go.mk' file to avoid generate a CPE for the go virtual package. Signed-off-by: Thomas Perale Signed-off-by: Peter Korsgaard (cherry picked from commit 1869b4065c6b4df909f5623719c818c0cc6394d2) Signed-off-by: Titouan Christophe --- package/go/go-bin/go-bin.mk | 3 +++ package/go/go-src/go-src.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/package/go/go-bin/go-bin.mk b/package/go/go-bin/go-bin.mk index a0f1e26e8f..ac42e4cbf3 100644 --- a/package/go/go-bin/go-bin.mk +++ b/package/go/go-bin/go-bin.mk @@ -4,12 +4,15 @@ # ################################################################################ +GO_BIN_VERSION = $(GO_VERSION) GO_BIN_SITE = https://go.dev/dl GO_BIN_SOURCE = go$(GO_VERSION).linux-$(call qstrip, $(BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH)).tar.gz GO_BIN_DL_SUBDIR = go HOST_GO_BIN_ACTUAL_SOURCE_TARBALL = go$(GO_VERSION).src.tar.gz GO_BIN_LICENSE = BSD-3-Clause GO_BIN_LICENSE_FILES = LICENSE +GO_BIN_CPE_ID_VENDOR = golang +GO_BIN_CPE_ID_PRODUCT = go HOST_GO_BIN_PROVIDES = host-go diff --git a/package/go/go-src/go-src.mk b/package/go/go-src/go-src.mk index 340aada94c..c1f11a2262 100644 --- a/package/go/go-src/go-src.mk +++ b/package/go/go-src/go-src.mk @@ -4,6 +4,7 @@ # ################################################################################ +GO_SRC_VERSION = $(GO_VERSION) GO_SRC_SITE = https://storage.googleapis.com/golang GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz GO_SRC_DL_SUBDIR = go @@ -11,6 +12,7 @@ GO_SRC_DL_SUBDIR = go GO_SRC_LICENSE = BSD-3-Clause GO_SRC_LICENSE_FILES = LICENSE GO_SRC_CPE_ID_VENDOR = golang +GO_SRC_CPE_ID_PRODUCT = go HOST_GO_SRC_PROVIDES = host-go HOST_GO_SRC_DEPENDENCIES = \