[openwrt/openwrt] toolchain: assign PKG_CPE_ID

LEDE Commits lede-commits at lists.infradead.org
Wed Sep 27 13:34:33 PDT 2023


lynxis pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/6a2d19cbab4dc6b40209f98bf5f8c34286d05d31

commit 6a2d19cbab4dc6b40209f98bf5f8c34286d05d31
Author: Alexander Couzens <lynxis at fe80.eu>
AuthorDate: Tue Sep 19 00:23:40 2023 +0200

    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 <lynxis at fe80.eu>
---
 toolchain/binutils/Makefile       | 1 +
 toolchain/gcc/common.mk           | 1 +
 toolchain/gdb/Makefile            | 1 +
 toolchain/glibc/common.mk         | 1 +
 toolchain/kernel-headers/Makefile | 1 +
 toolchain/nasm/Makefile           | 1 +
 6 files changed, 6 insertions(+)

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index d1961603c4..336cf06bc3 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 bef4fa37f8..e7b8a176b3 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),8.4.0)
   PKG_HASH:=e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 6ed3b190ce..a9b6f24be2 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -13,6 +13,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gdb
 PKG_HASH:=1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32
+PKG_CPE_ID:=cpe:/a:gnu:gdb
 GDB_DIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GDB_DIR)
diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 256eda0435..06fd531b3d 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -16,6 +16,7 @@ PKG_SOURCE_VERSION:=a4217408a3d6050a7f42ac23adb6ac7218dca85f
 PKG_MIRROR_HASH:=3c8b0a515587a5d92d242f63355fed4e92a4fbcabdea213c62282e7d364ec485
 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 eea0ffbde0..cd25f8a6de 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 f733c52912..5cef7bde83 100644
--- a/toolchain/nasm/Makefile
+++ b/toolchain/nasm/Makefile
@@ -11,6 +11,7 @@ PKG_SOURCE_URL:=https://www.nasm.us/pub/nasm/releasebuilds/$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 PKG_HASH:=3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f
+PKG_CPE_ID:=cpe:/a:nasm:nasm
 
 HOST_BUILD_PARALLEL:=1
 




More information about the lede-commits mailing list