Skip to content
This repository was archived by the owner on Aug 13, 2026. It is now read-only.

Merge 2.0 branch into develop [JIRA: TOOLS-131] #178

Merged
zeeshanlakhani merged 15 commits into from
Mar 19, 2015
Merged

Merge 2.0 branch into develop [JIRA: TOOLS-131] #178

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3a7eb1f
add support for custom exit codes to nodetool rpc & friends
jrwest Oct 7, 2014
c82e639
Merge pull request #166 from basho/feature/jrw/nodetool-exit-codes-re…
jrwest Oct 14, 2014
60b6feb
Handle net_ticktime argument specially. Resolves RIAK-1281
Nov 11, 2014
e99a3c6
Merge pull request #170 from basho/bugfix/sdc/netticktime-arg
Nov 12, 2014
6c174a6
Never remove the data dirs for Riak
gcymbalski Dec 4, 2014
8fa5ee5
Replace Riak if we are building an EE package
gcymbalski Dec 4, 2014
83ff958
And now with a better understanding of how these templates work
gcymbalski Dec 16, 2014
e7f8ad6
Fixes for debian control template
Dec 18, 2014
f42f774
Merge pull request #173 from basho/fixes/lrb/deb-template-fix
gcymbalski Dec 18, 2014
7b3d6cd
Finishing the merge from replace-riak-if-ee
gcymbalski Dec 19, 2014
7c31abe
Never remove data dirs on uninstall for Debian
gcymbalski Dec 19, 2014
4823f88
Update to actually support fbsdng
gcymbalski Dec 23, 2014
b3b8ee3
Make sure we actually own lib dirs for CS on SmartOS
gcymbalski Feb 11, 2015
b69dc56
Make sure that locked deps are obeyed for packaging
gcymbalski Feb 25, 2015
39e3e50
Merge pull request #179 from basho/obey-locked-deps
gcymbalski Feb 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion priv/templates/fbsd/Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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