|
@@ -426,10 +426,10 @@ ifdef $(3)_OVERRIDE_SRCDIR
|
|
|
$(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR)
|
|
|
endif
|
|
|
|
|
|
-$(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1))
|
|
|
-$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME))
|
|
|
+$(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1))
|
|
|
+$(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME))
|
|
|
$(2)_DL_DIR = $$(DL_DIR)
|
|
|
-$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
|
|
|
+$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME)
|
|
|
|
|
|
ifndef $(2)_SUBDIR
|
|
|
ifdef $(3)_SUBDIR
|
|
@@ -458,7 +458,7 @@ ifndef $(2)_SOURCE
|
|
|
ifdef $(3)_SOURCE
|
|
|
$(2)_SOURCE = $$($(3)_SOURCE)
|
|
|
else ifdef $(2)_VERSION
|
|
|
- $(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz
|
|
|
+ $(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz
|
|
|
endif
|
|
|
endif
|
|
|
|
|
@@ -532,7 +532,7 @@ endif
|
|
|
|
|
|
$(2)_REDISTRIBUTE ?= YES
|
|
|
|
|
|
-$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME)
|
|
|
+$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW)
|
|
|
|
|
|
# When a target package is a toolchain dependency set this variable to
|
|
|
# 'NO' so the 'toolchain' dependency is not added to prevent a circular
|
|
@@ -838,9 +838,9 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),)
|
|
|
# is that the license still applies to the files distributed as part
|
|
|
# of the rootfs, even if the sources are not themselves redistributed.
|
|
|
ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),)
|
|
|
- $(Q)$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined))
|
|
|
+ $(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined))
|
|
|
else
|
|
|
- $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_RAW_BASE_NAME),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))
|
|
|
+ $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))
|
|
|
endif # license files
|
|
|
|
|
|
ifeq ($$($(2)_SITE_METHOD),local)
|