From ed959089ee886293f470d2d23d7cc0716de2a017 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 7 May 2016 18:14:28 +0200 Subject: [PATCH] core/pkg-generic: add variable to store the package rawname-version Introduce a new per-package variable to store the 'rawname-version' tuple, instead of computing it every time we need it. Currently, it's only a single location, but follow-up patches will introduce more use of it. Reported-by: Luca Ceresoli Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli Reviewed-by: Luca Ceresoli Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f9c7cf8e14..688123ce03 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -393,6 +393,7 @@ ifdef $(3)_OVERRIDE_SRCDIR endif $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) +$(2)_RAW_BASE_NAME = $$($(2)_RAWNAME)-$$($(2)_VERSION) $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) @@ -423,7 +424,7 @@ ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $$($(3)_SOURCE) else - $(2)_SOURCE ?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz + $(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz endif endif -- 2.30.2