Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
@@ -518,7 +518,7 @@ ifndef $(2)_SOURCE
|
||||
ifdef $(3)_SOURCE
|
||||
$(2)_SOURCE = $$($(3)_SOURCE)
|
||||
else ifdef $(2)_VERSION
|
||||
$(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz
|
||||
$(2)_SOURCE ?= $$($(2)_BASENAME_RAW)$$(call pkg_source_ext,$(2))
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -614,6 +614,76 @@ $(2)_REDISTRIBUTE ?= YES
|
||||
|
||||
$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW)
|
||||
|
||||
# If any of the <pkg>_CPE_ID_* variables are set, we assume the CPE ID
|
||||
# information is valid for this package.
|
||||
ifneq ($$($(2)_CPE_ID_VENDOR)$$($(2)_CPE_ID_PRODUCT)$$($(2)_CPE_ID_VERSION)$$($(2)_CPE_ID_UPDATE)$$($(2)_CPE_ID_PREFIX),)
|
||||
$(2)_CPE_ID_VALID = YES
|
||||
endif
|
||||
|
||||
# When we're a host package, make sure to use the variables of the
|
||||
# corresponding target package, if any.
|
||||
ifneq ($$($(3)_CPE_ID_VENDOR)$$($(3)_CPE_ID_PRODUCT)$$($(3)_CPE_ID_VERSION)$$($(3)_CPE_ID_UPDATE)$$($(3)_CPE_ID_PREFIX),)
|
||||
$(2)_CPE_ID_VALID = YES
|
||||
endif
|
||||
|
||||
# If the CPE ID is valid for the target package so it is for the host
|
||||
# package
|
||||
ifndef $(2)_CPE_ID_VALID
|
||||
ifdef $(3)_CPE_ID_VALID
|
||||
$(2)_CPE_ID_VALID = $$($(3)_CPE_ID_VALID)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($$($(2)_CPE_ID_VALID),YES)
|
||||
# CPE_ID_VENDOR
|
||||
ifndef $(2)_CPE_ID_VENDOR
|
||||
ifdef $(3)_CPE_ID_VENDOR
|
||||
$(2)_CPE_ID_VENDOR = $$($(3)_CPE_ID_VENDOR)
|
||||
else
|
||||
$(2)_CPE_ID_VENDOR = $$($(2)_RAWNAME)_project
|
||||
endif
|
||||
endif
|
||||
|
||||
# CPE_ID_PRODUCT
|
||||
ifndef $(2)_CPE_ID_PRODUCT
|
||||
ifdef $(3)_CPE_ID_PRODUCT
|
||||
$(2)_CPE_ID_PRODUCT = $$($(3)_CPE_ID_PRODUCT)
|
||||
else
|
||||
$(2)_CPE_ID_PRODUCT = $$($(2)_RAWNAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
# CPE_ID_VERSION
|
||||
ifndef $(2)_CPE_ID_VERSION
|
||||
ifdef $(3)_CPE_ID_VERSION
|
||||
$(2)_CPE_ID_VERSION = $$($(3)_CPE_ID_VERSION)
|
||||
else
|
||||
$(2)_CPE_ID_VERSION = $$($(2)_VERSION)
|
||||
endif
|
||||
endif
|
||||
|
||||
# CPE_ID_UPDATE
|
||||
ifndef $(2)_CPE_ID_UPDATE
|
||||
ifdef $(3)_CPE_ID_UPDATE
|
||||
$(2)_CPE_ID_UPDATE = $$($(3)_CPE_ID_UPDATE)
|
||||
else
|
||||
$(2)_CPE_ID_UPDATE = *
|
||||
endif
|
||||
endif
|
||||
|
||||
# CPE_ID_PREFIX
|
||||
ifndef $(2)_CPE_ID_PREFIX
|
||||
ifdef $(3)_CPE_ID_PREFIX
|
||||
$(2)_CPE_ID_PREFIX = $$($(3)_CPE_ID_PREFIX)
|
||||
else
|
||||
$(2)_CPE_ID_PREFIX = cpe:2.3:a
|
||||
endif
|
||||
endif
|
||||
|
||||
# Calculate complete CPE ID
|
||||
$(2)_CPE_ID = $$($(2)_CPE_ID_PREFIX):$$($(2)_CPE_ID_VENDOR):$$($(2)_CPE_ID_PRODUCT):$$($(2)_CPE_ID_VERSION):$$($(2)_CPE_ID_UPDATE):*:*:*:*:*:*
|
||||
endif # ifeq ($$($(2)_CPE_ID_VALID),YES)
|
||||
|
||||
# When a target package is a toolchain dependency set this variable to
|
||||
# 'NO' so the 'toolchain' dependency is not added to prevent a circular
|
||||
# dependency.
|
||||
|
||||
Reference in New Issue
Block a user