Skip to content

Commit

Permalink
Minor fixes to build and packaging
Browse files Browse the repository at this point in the history
See #1
  • Loading branch information
martinsumner committed Feb 7, 2024
1 parent e9b61c5 commit 1840fe5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ PKG_ID := "$(REPO_TAG)-OTP$(OTP_VER)"
PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//')

package:
compile
mkdir -p rel/pkg/out/$(PKG_ID)
git archive --format=tar HEAD | gzip >rel/pkg/out/$(PKG_ID).tar.gz
$(MAKE) -f rel/pkg/Makefile
Expand Down
5 changes: 3 additions & 2 deletions priv/riak.schema
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@
]}.

%% VM emulator ignore break signal (prevent ^C / ^Gq)
{mapping, "erlang.vm.ignore_break_signal", "vm_args.+Bi", [
{default, "true"},
{mapping, "erlang.vm.ignore_break_signal", "vm_args.+B", [
{default, "i"},
{datatype, {enum, [c, d, i]}},
merge
]}.

Expand Down
1 change: 1 addition & 0 deletions rel/pkg/deb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ default:
dch --create --package riak -v "$(PKG_VERSION)" \
"Build from $(PKG_ID)";\
debuild --prepend-path=$(ERLANG_BIN) \
--no-lintian \
-e REVISION=$(PKG_VERSION) \
-e RELEASE=$(PKG_BUILD) \
-i -uc -us -b
Expand Down
1 change: 1 addition & 0 deletions rel/pkg/deb/debian/riak.riak.service
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Type=simple
PIDFile=/run/riak/riak.pid
EnvironmentFile=-/etc/default/riak
RuntimeDirectory=riak
LimitNOFILE=524288

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion rel/vars/dev_vars.config.src
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{sasl_log_dir, "{{platform_log_dir}}/sasl"}.
{repl_data_root, "{{platform_data_dir}}/riak_repl/"}.

{logger_level, debug}.
{logger_level, info}.

%%
%% etc/vm.args
Expand Down

0 comments on commit 1840fe5

Please sign in to comment.