Skip to content

Commit

Permalink
Merge pull request #179 from basho/obey-locked-deps
Browse files Browse the repository at this point in the history
Make sure that locked deps are obeyed for packaging
  • Loading branch information
gcymbalski committed Feb 27, 2015
2 parents b3b8ee3 + b69dc56 commit 39e3e50
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion priv/templates/fbsd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ $(BUILD_STAGE_DIR): buildrel
# * Ensure all binaries are executable
# * copy the vars.config over for build config
buildrel:
OVERLAY_VARS="overlay_vars=../fbsd/vars.config" $(MAKE) deps rel
OVERLAY_VARS="overlay_vars=../fbsd/vars.config" $(MAKE) rel
chmod 0755 rel/{{package_install_name}}/bin/* rel/{{package_install_name}}/erts-*/bin/*

$(BUILDDIR):
Expand Down
2 changes: 1 addition & 1 deletion priv/templates/fbsdng/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ $(BUILD_STAGE_DIR): buildrel
# * Ensure all binaries are executable
# * copy the vars.config over for build config
buildrel:
OVERLAY_VARS="overlay_vars=../fbsdng/vars.config" $(MAKE) deps rel
OVERLAY_VARS="overlay_vars=../fbsdng/vars.config" $(MAKE) rel
chmod 0755 rel/{{package_install_name}}/bin/* rel/{{package_install_name}}/erts-*/bin/*

$(BUILDDIR):
Expand Down
2 changes: 1 addition & 1 deletion priv/templates/smartos/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ patch_runner: buildrel
# * Ensure all binaries are executable
# * copy the vars.config over for build config
buildrel: $(BUILDDIR) smartos_check
OVERLAY_VARS="overlay_vars=../smartos/vars.config" $(MAKE) deps rel
OVERLAY_VARS="overlay_vars=../smartos/vars.config" $(MAKE) rel
chmod 0755 $(BUILDDIR)/rel/{{package_install_name}}/bin/* $(BUILDDIR)/rel/{{package_install_name}}/erts-*/bin/*

$(BUILDDIR):
Expand Down
2 changes: 1 addition & 1 deletion priv/templates/solaris/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildrel:
@# Make sure we set our EUID properly
@# Ye Olde Bourne Shell on Solaris means we have to do it old school
echo "Using `which erl` to build"; \
OVERLAY_VARS="overlay_vars=../solaris/vars.config" $(MAKE) deps rel
OVERLAY_VARS="overlay_vars=../solaris/vars.config" $(MAKE) rel
chmod 0755 rel/{{package_install_name}}/bin/* \
rel/{{package_install_name}}/erts-*/bin/*
if [ "{{bin_or_sbin}}" != "bin" ]; then \
Expand Down

0 comments on commit 39e3e50

Please sign in to comment.