Volk/config.guess, etc

Looks like volk/config.guess and volk/config.sub got added to the GIT
repo, and since these are “artifact” files–that is, files that are
generated locally during configuration, GIT now gripes about them
when you do a “git pull”. They shouldn’t appear in the repo
at all, as far as I can tell.


Marcus L.
Principal Investigator
Shirleys Bay Radio Astronomy Consortium

On Sat, Jun 18, 2011 at 17:47, Marcus D. Leech [email protected]
wrote:

Looks like volk/config.guess and volk/config.sub got added to the GIT repo,
and since these are “artifact” files–that is, files that are
generated locally during configuration, GIT now gripes about them when
you do a “git pull”. They shouldn’t appear in the repo
at all, as far as I can tell.

Actually, we keep canonical versions in the repository for the main
build,
the howto build, and now the volk build. These files get put into the
distribution tarballs and it is important to have the latest versions
from
upstream, not whatever files happen to be on whatever the build
machine’s OS
at the time the tarballs are created.

The volk build did not have these in the repository until a few weeks
ago.

Johnathan

On 06/18/2011 11:33 PM, Johnathan C. wrote:

The volk build did not have these in the repository until a few weeks ago.

Johnathan
Well, their presence is causing “git pull” to balk.


Principal Investigator
Shirleys Bay Radio Astronomy Consortium

On Sat, Jun 18, 2011 at 20:52, Marcus D. Leech [email protected]
wrote:

Well, their presence is causing “git pull” to balk.

Just delete your local copies (or symlinks) of config.sub and
config.guess
(in volk), then git pull will put the ones from the repo there. You’ll
need
to rerun bootstrap.

Johnathan

On 06/19/2011 02:34 AM, Johnathan C. wrote:

Johnathan
Yup, did that. But will their ongoing presence become an ongoing
problem?

On Sun, Jun 19, 2011 at 04:24, Marcus D. Leech [email protected]
wrote:

No.

The bootstrap process first looks to see if the files exist already, and
uses them. Otherwise it generates local copies or symlinks from the
user’s
autotools installation. The volk build (mistakenly) didn’t have those
files
in the repository initially, so you ended up with machine generated
local
copies that you later needed to delete to make room for the repository
supplied ones.

Again, it’s how the main and howto builds have worked since the
beginning.

Johnathan