diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index fbc860019c..e1d68e9a45 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -17,9 +17,14 @@ OPENJDK_VERSION_MAJOR = 17 OPENJDK_VERSION_MINOR = 0.18 OPENJDK_VERSION_BUILD = 8 endif + OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)+$(OPENJDK_VERSION_BUILD) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) +OPENJDK_CPE_ID_VENDOR = oracle +# Override automatic CPE ID because '+' in $(OPENJDK_VERSION) is not alphanumeric or ._- +OPENJDK_CPE_ID_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE OPENJDK_INSTALL_STAGING = YES