public inbox for crossgcc@sourceware.org
 help / color / mirror / Atom feed
From: Michael Hope <michael.hope@linaro.org>
To: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Cc: crossgcc@sourceware.org
Subject: [PATCH] scripts: Make the crosstool-NG version an optional part of pkgversion
Date: Mon, 17 Oct 2011 03:40:00 -0000	[thread overview]
Message-ID: <87hb38ffr0.fsf@linaro.org> (raw)

# HG changeset patch
# User Michael Hope <michael.hope@linaro.org>
# Date 1317709748 -46800
# Node ID 931a96c7b84610c33a5535f574adf01df63d1a89
# Parent  5b157f46a3ab4830e4117811e9338e7d74d3a55d
scripts: Make the crosstool-NG version an optional part of pkgversion.

We use the pkgversion for the Linaro release name.  This patch lets you
turn off the automatic crosstool-NG@revno and just use the configured
package version.

Signed-off-by: Michael Hope <michael.hope@linaro.org>

diff -r 5b157f46a3ab -r 931a96c7b846 config/toolchain.in
--- a/config/toolchain.in	Tue Oct 04 11:47:39 2011 +1300
+++ b/config/toolchain.in	Tue Oct 04 19:29:08 2011 +1300
@@ -93,6 +93,13 @@
 
       This is passed to the configure flag --with-pkgversion.
 
+config TOOLCHAIN_PKGVERSION_WITH_CROSSTOOL
+    bool
+    prompt "Include the crosstool-NG version in the ID string"
+    default y
+    help
+      Include the crosstool-NG version in the package version string.
+
 config TOOLCHAIN_BUGURL
     string
     prompt "Toolchain bug URL"
diff -r 5b157f46a3ab -r 931a96c7b846 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Tue Oct 04 11:47:39 2011 +1300
+++ b/scripts/crosstool-NG.sh.in	Tue Oct 04 19:29:08 2011 +1300
@@ -154,7 +154,11 @@
 CT_CC_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_EXTRA_CONFIG} "${CT_CC_EXTRA_CONFIG_ARRAY[@]}" )
 
 # Compute the package version string
-CT_PKGVERSION="crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}"
+if [ "${CT_TOOLCHAIN_PKGVERSION_WITH_CROSSTOOL}" = "y" ]; then
+    CT_PKGVERSION="crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}"
+else
+    CT_PKGVERSION="${CT_TOOLCHAIN_PKGVERSION}"
+fi
 
 # Compute the working directories names
 CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"


--
For unsubscribe information see http://sourceware.org/lists.html#faq

             reply	other threads:[~2011-10-17  3:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-17  3:40 Michael Hope [this message]
2011-10-18 16:20 ` Yann E. MORIN
2011-10-18 19:43   ` Michael Hope
2011-10-18 21:02     ` Yann E. MORIN
2011-10-18 22:46       ` Michael Hope

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=87hb38ffr0.fsf@linaro.org \
    --to=michael.hope@linaro.org \
    --cc=crossgcc@sourceware.org \
    --cc=yann.morin.1998@anciens.enib.fr \
    /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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).