From: Alexander Couzens Date: Mon, 18 Sep 2023 22:23:40 +0000 (+0200) Subject: toolchain: assign PKG_CPE_ID X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1d3e4eff5fdd48a1efaf5f6923a0d9d82e28a8;p=thirdparty%2Fopenwrt.git toolchain: assign PKG_CPE_ID The PKG_CPE_ID links to NIST CPE version 2.2. Assign PKG_CPE_ID to all remaining package which have a CPE ID. Not every package has a CPE id. Related: https://github.com/openwrt/packages/issues/8534 Signed-off-by: Alexander Couzens --- diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 24eaf705664..150eaea5604 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -12,6 +12,7 @@ BIN_VERSION:=$(PKG_VERSION) PKG_SOURCE_URL:=@GNU/binutils/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_CPE_ID:=cpe:/a:gnu:binutils TAR_OPTIONS += --exclude='*.rej' diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index e2dfcea6cb5..44a1891d4a0 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -27,6 +27,7 @@ GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_CPE_ID:=cpe:/a:gnu:gcc ifeq ($(PKG_VERSION),5.5.0) PKG_HASH:=530cea139d82fe542b358961130c69cfde8b3d14556370b65823d2f91f0ced87 diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index 41ba9853fd2..e7c6c72a9a6 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -22,6 +22,7 @@ PKG_VERSION:=8.3.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gdb PKG_HASH:=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4 +PKG_CPE_ID:=cpe:/a:gnu:gdb GDB_DIR:=$(PKG_NAME)-$(PKG_VERSION) endif diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 4ddf55dfa9e..4053b664993 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -15,6 +15,7 @@ PKG_SOURCE_VERSION:=daf88b1dd1a41fcb324801c02ead7a8d5aac3851 PKG_MIRROR_HASH:=fc78ef46c52c922ea44d079533d4d3017a0c921b4ed9aab8bb1dd071322b169f PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz +PKG_CPE_ID:=cpe:/a:gnu:glibc HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR) CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT) diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 69318814937..bf105271415 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -17,6 +17,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=linux PKG_VERSION:=$(LINUX_VERSION) PKG_SOURCE:=$(LINUX_SOURCE) +PKG_CPE_ID:=cpe:/o:linux:linux_kernel ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)) diff --git a/toolchain/nasm/Makefile b/toolchain/nasm/Makefile index 3efcc862033..fc5bc2d2f7c 100644 --- a/toolchain/nasm/Makefile +++ b/toolchain/nasm/Makefile @@ -9,8 +9,8 @@ PKG_VERSION:=2.14 PKG_SOURCE_URL:=https://www.nasm.us/pub/nasm/releasebuilds/$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz - PKG_HASH:=97c615dbf02ef80e4e2b6c385f7e28368d51efc214daa98e600ca4572500eec0 +PKG_CPE_ID:=cpe:/a:nasm:nasm HOST_BUILD_PARALLEL:=1