Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: llandwerlin at gmail.com <llandwerlin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] Fix <PKG_NAME>_VERSION variable setup
Date: Sun, 19 Sep 2010 01:21:15 +0200	[thread overview]
Message-ID: <1284852075-17257-1-git-send-email-llandwerlin@gmail.com> (raw)

From: Lionel Landwerlin <llandwerlin@gmail.com>

Commit 993e51bc22f508fbaf39c5c49fd0595fc5c56013 introduced a problem
to compute <PKG_NAME>_VERSION variable when PKG_NAME start with
'HOST_'.

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
 package/Makefile.package.in |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 58a9a51..377df65 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -337,22 +337,22 @@ define GENTARGETS_INNER
 $(2)_TYPE                       =  $(5)
 $(2)_NAME			=  $(1)
 
+# Keep the package version that may contain forward slashes in the _DL_VERSION
+# variable, then replace all forward slashes ('/') by underscores ('_') to
+# 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)
  else
   $(2)_VERSION = undefined
  endif
+else
+ $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
 endif
 
-# Keep the package version that may contain forward slashes in the _DL_VERSION
-# variable, then replace all forward slashes ('/') by underscores ('_') to
-# 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)
-$(2)_VERSION = $(subst /,_,$($(2)_VERSION))
-
 $(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)
 $(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
 $(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
-- 
1.7.1

             reply	other threads:[~2010-09-18 23:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-18 23:21 llandwerlin at gmail.com [this message]
2010-09-20 14:31 ` [Buildroot] [PATCH] Fix <PKG_NAME>_VERSION variable setup Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1284852075-17257-1-git-send-email-llandwerlin@gmail.com \
    --to=llandwerlin@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox