diff options
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-08-04 21:34:24 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2011-08-04 21:48:08 +0200
commitf940d7602ca0810da0432638d2ce8441d6486991 (patch)
parentb0d0e060771c80de5afed4d591e63a2b6520eec4 (diff)
package: fix <pkg>_DL_VERSION value
993e51bc22f508fbaf39c5c49fd0595fc5c56013 introduced a <pkg>_DL_VERSION in addition to <pkg>_VERSION. This variable, purely internal to the package infrastructure, allows to store the *raw* version name, as defined in the package .mk file. However, as this version string can contain slashes, it is not appropriate to be part of the build directory name of the package. This is why <pkg>_VERSION is defined to be the same thing as <pkg>_DL_VERSION, except that slashes are replaced by underscores. However, the initial implementation didn't take into account the case of host packages. So 763822e874fd8d39b591feaa9639f76183897fb7 was committed to fix this. But unfortunately, this commit got it wrong again: it forgot the case where <pkg>_VERSION is set, but not HOST_<pkg>_VERSION. In this case, HOST_<pkg>_DL_VERSION remained empty. This can be seen for example by building host-sstrip. This problem has been noticed by Julien Boibessot <julien.boibessot@free.fr>, who also helped in fixing the issue. Thanks! The fix is simply to ensure that <pkg>_DL_VERSION is properly set in all cases: when HOST_<pkg>_VERSION is defined, when only <pkg>_VERSION is defined, and when no version is defined. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
1 files changed, 5 insertions, 3 deletions
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 90530dc432..868bf28420 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -366,15 +366,17 @@ $(2)_NAME = $(1)
# sanitize the package version that is used in paths, directory and file names.
# Forward slashes may appear in the package's version when pointing to a
# version control system branch or tag, for example remotes/origin/1_10_stable.
-$(2)_DL_VERSION = $($(2)_VERSION)
ifndef $(2)_VERSION
ifdef $(3)_VERSION
- $(2)_VERSION = $($(3)_VERSION)
+ $(2)_DL_VERSION = $($(3)_VERSION)
+ $(2)_VERSION = $(subst /,_,$($(3)_VERSION))
$(2)_VERSION = undefined
+ $(2)_DL_VERSION = undefined
- $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
+ $(2)_DL_VERSION = $($(2)_VERSION)
+ $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)