[PATCH] scripts: Make the crosstool-NG version an optional part of pkgversion

Michael Hope michael.hope@linaro.org
Mon Oct 17 03:40:00 GMT 2011


# 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



More information about the crossgcc mailing list