X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fautoconf%2F0001-dont-add-dirty-to-version.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fautoconf%2F0001-dont-add-dirty-to-version.patch;h=e8d9f6a29d941fa818cce96aa2bd78f639864c20;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/autoconf/0001-dont-add-dirty-to-version.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/autoconf/0001-dont-add-dirty-to-version.patch
new file mode 100644
index 0000000..e8d9f6a
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/autoconf/0001-dont-add-dirty-to-version.patch
@@ -0,0 +1,28 @@
+autoconf: don't append -dirty to version
+
+Don't append -dirty to autoconf version number if the buildroot git tree
+has uncommited changes.
+
+This script is meant for the autoconf developers, but it also activates
+if you build autoconf in a subdirectory of a git tree (E.G. like how it's
+commonly done in buildroot).
+
+The affect is that autoconf gets built as being version 2.65-dirty, which
+breaks programs (like Python) which explicitly checks for autoconf-2.65.
+
+[Gustavo: update for autoconf 2.69]
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen
+--- autoconf-2.69.orig/build-aux/git-version-gen	2013-06-27 11:31:02.340200154 -0300
++++ autoconf-2.69/build-aux/git-version-gen	2013-06-27 11:31:13.734577033 -0300
+@@ -203,7 +203,7 @@
+       *) # Append the suffix only if there isn't one already.
+           case $v in
+             *-dirty) ;;
+-            *) v="$v-dirty" ;;
++            #*) v="$v-dirty" ;;
+           esac ;;
+   esac
+ fi