From 7023870b28b1eb87fb6eca2904c72e91fdcaf625 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 29 May 2015 13:47:14 -0400 Subject: build: outdated autotools helper config.* files in dist tarfile Our jenkins release task clones the source, runs ./autogen.sh (where config.{guess,sub} come from) and ./configure, before running `make dist` to product the release glusterfs-X.Y.Z.tar.gz. The config.{guess,sub} in the tar file come from the archaic autoconf in CentOS 6.3, which is what the glusterfs jenkins is running on. We should not be shipping the (arbitrary, old) config.{guess,sub} files from our jenkins machine. Change-Id: Ib7643ae2e54d0e25c95f4e93e5dffb22cbe11523 BUG: 1223937 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/11009 Reviewed-by: Niels de Vos Tested-by: Gluster Build System --- Makefile.am | 1 + glusterfs.spec.in | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 82175ee7ea9..1282c981d53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ dist-hook: gen-VERSION gen-ChangeLog -rm -fr $(distdir)/contrib/argp-standalone/autom4te.cache -rm -fr $(distdir)/contrib/argp-standalone/.deps -rm -fr $(distdir)/contrib/umountd/.deps + -rm -fr $(distdir)/config.{guess,sub} .PHONY: gen-VERSION gen-ChangeLog diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 1e5a8125ad4..36add2caccd 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -571,10 +571,7 @@ This package provides the translators needed on any GlusterFS client. %setup -q -n %{name}-%{version}%{?prereltag} %build -# For whatever reason, install-sh is sometimes missing. When this gets fixed, -# there is no need to run ./autogen or have a BuildRequires for automake. -[ -e 'install-sh' -o -e 'install.sh' ] || ./autogen.sh -%configure \ +./autogen.sh && %configure \ %{?_with_tmpfilesdir} \ %{?_without_rdma} \ %{?_without_epoll} \ -- cgit