Fix build.sh to work on Amazon Linux. #6

Merged
merged 1 commit into from Mar 15, 2013

Conversation

Projects
None yet
3 participants
Contributor

psi commented Mar 5, 2013

On Amazon Linux, buildsys-macros providing /etc/rpm/macros.dist does
not exist. Rather, system-release provides /etc/rpm/macros.disttag.
Apart from failing the check for /etc/rpm/macros.dist in build.sh, the
RPM builds fine. This patch changes build.sh to look for either file.

I ran into this while using Opscode's runit cookbook, which now bundles runit-rpm and uses it to build runit on RHEL-family platforms.

@psi psi Fix build.sh to work on Amazon Linux.
On Amazon Linux, `buildsys-macros` providing `/etc/rpm/macros.dist` does
not exist. Rather, `system-release` provides `/etc/rpm/macros.disttag`.
Apart from failing the check for `/etc/rpm/macros.dist` in build.sh, the
RPM builds fine. This patch changes build.sh to look for either file.
f5d7886

psi referenced this pull request in chef-cookbooks/runit Mar 5, 2013

Merged

Update bundled runit-rpm to support Amazon Linux. #24

Owner

imeyer commented Mar 15, 2013

Awesome! Thanks a ton. 😺

@imeyer imeyer added a commit that referenced this pull request Mar 15, 2013

@imeyer imeyer Merge pull request #6 from psi/amazon-linux
Fix build.sh to work on Amazon Linux.
e412511

@imeyer imeyer merged commit e412511 into imeyer:master Mar 15, 2013

gsandie commented Mar 18, 2013

I just ran into this too, thanks for the fix @psi :D

@clkao clkao pushed a commit to clkao-cookbooks/runit that referenced this pull request Nov 4, 2013

@psi psi Update bundled runit-rpm to support Amazon Linux.
The fix provided here is identical to:
  imeyer/runit-rpm#6
23584b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment