Skip to content

Allow 'make rpm' work from a release tarball #6824

Merged
merged 1 commit into from Jun 23, 2014

3 participants

@sivel
Ansible member
sivel commented Apr 2, 2014

make rpm cannot be run from a release tarball because the release tarball is missing the VERSION and MANIFEST.in files.

I am unsure if this is intended, but this is a somewhat simple pull request to have MANIFEST.in include VERSION and itself, so that make rpm will work.

@mpdehaan
mpdehaan commented Apr 2, 2014

This may be worthwhile consulting with Nirik in IRC to see how he does this, but we in fact run from source checkouts and do "make rpm", which leverages the results of "make sdist" too.

So I'm a bit confused.

As the RPM should not probably not include MANIFEST.in and VERSION on the filesystem, I'm a little unclear about this one.

@sivel
Ansible member
sivel commented Apr 2, 2014

Yeah, it is fine when you build from a git clone. But the Makefile requires VERSION and MANIFEST.in in order to build the RPMs. So if they are not included in the release tarball, you can't build RPMs from the release.

I'm fine either way, and I can ping Nirik. I'm not too concerned about the functionality but was helping someone else in IRC earlier who was trying to do this.

@sivel
Ansible member
sivel commented Apr 5, 2014

I believe from our conversation today that this should be safe. I've verified that neither MANIFEST.in nor VERSION end up in the RPM.

@mpdehaan mpdehaan added P5 and removed P4 labels Apr 17, 2014
@mpdehaan mpdehaan removed the needs_info label Jun 1, 2014
@jimi-c jimi-c merged commit 52c7d50 into ansible:devel Jun 23, 2014
@jimi-c
Ansible member
jimi-c commented Jun 23, 2014

Merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.