Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes jordansissel/fpm#707 #716

Merged
merged 1 commit into from Jun 13, 2014

Conversation

@alanivey
Copy link
Contributor

alanivey commented Jun 9, 2014

With rpms, if --architecture and --rpm-os are specified and different than the host, --target would be passed to rpmbuild twice, causing an error.

Example: an OS X host (uname -s = "Darwin") with x86_64 (uname -m) architecture building for --rpm-os linux and --architecture noarch.

This change only adds --target to the rpmbuild args once, fixing this specific error.

With rpms, if `--architecture` and `--rpm-os` are specified and
different than the host, `--target` would be passed to `rpmbuild` twice,
causing an error.

Example: an OS X host (`uname -s` = "Darwin") with x86_64 architecture
building for `--rpm-os linux` and `--architecture noarch`.

This change only adds `--target` to the `rpmbuild` args once, fixing
this specific error.
vStone added a commit to vStone/fpm that referenced this pull request Jun 11, 2014
See jordansissel#716 for more information

* pr/716:
  Fixes jordansissel#707
@vStone

This comment has been minimized.

Copy link
Contributor

vStone commented Jun 11, 2014

Did you run the tests after these changes? Could be a conflict with other merged requests: https://travis-ci.org/vStone/fpm/jobs/27323220

@alanivey

This comment has been minimized.

Copy link
Contributor Author

alanivey commented Jun 11, 2014

No, but I will do so now.

@alanivey

This comment has been minimized.

Copy link
Contributor Author

alanivey commented Jun 11, 2014

Mine fails on another step (output with digest and compression settings bzip2/sha1 should have the compressor and digest algorithm listed), but it fails too on the master branch, not just my branch. What should I be doing to get a clean test, so then I can test my branch?

@alanivey

This comment has been minimized.

Copy link
Contributor Author

alanivey commented Jun 11, 2014

Was on ruby 2.1.1, switched to 1.8.7, also tried tag v1.1.0 and bundle exec rspec fails at the same spot each time. I must be missing something on my system. Is there a list of prereqs for running the test suite successfully?

@vStone

This comment has been minimized.

Copy link
Contributor

vStone commented Jun 11, 2014

I'm afraid the only clue I can offer is here: https://github.com/vStone/fpm/blob/develop/.travis.yml
But thats obviously for an ubuntu host

@vStone

This comment has been minimized.

Copy link
Contributor

vStone commented Jun 11, 2014

mkay, this might be due to another pull requests I merged. I'll investigate and get back :)

@alanivey

This comment has been minimized.

Copy link
Contributor Author

alanivey commented Jun 11, 2014

As for the build error I keep getting on stable code releases; I think it has something to do with the version of 'rpmbuild' I get from OS X's homebrew. I'll try and set up the version of Linux used by TravisCI and run tests against my PR with that to see if they pass.

@vStone

This comment has been minimized.

Copy link
Contributor

vStone commented Jun 11, 2014

Tests run fine. Other pull request introduced the errors :)

vStone added a commit to vStone/fpm that referenced this pull request Jun 11, 2014
See jordansissel#716 for more information

* pr/716:
  Fixes jordansissel#707
@vStone

This comment has been minimized.

Copy link
Contributor

vStone commented Jun 11, 2014

You'll need a couple of other pull requests if you want to get a clean build a anyhow.
Looks good: https://travis-ci.org/vStone/fpm/builds/27346014

@alanivey

This comment has been minimized.

Copy link
Contributor Author

alanivey commented Jun 11, 2014

Excellent! Hopefully @jordansissel will get this in the next official FPM release.

@jordansissel

This comment has been minimized.

Copy link
Owner

jordansissel commented Jun 11, 2014

reviewing now!

@portertech

This comment has been minimized.

Copy link

portertech commented Jun 13, 2014

Just ran into the same issue, this PR seems reasonable.

jordansissel added a commit that referenced this pull request Jun 13, 2014
@jordansissel jordansissel merged commit ebcaf8a into jordansissel:master Jun 13, 2014
prof-milki pushed a commit to prof-milki/xpm that referenced this pull request Dec 18, 2014
prof-milki pushed a commit to prof-milki/xpm that referenced this pull request Dec 27, 2014
jordansissel added a commit that referenced this pull request Apr 24, 2015
jordansissel added a commit that referenced this pull request Jun 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.