Packaging improvements & upgrade to rebar3.18

Makefile

@@ -4,10 +4,10 @@ PKG_REVISION    ?= $(shell git describe --tags 2>/dev/null)
 PKG_BUILD        = 1
 BASE_DIR         = $(shell pwd)
 ERLANG_BIN       = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
-OTP_VER          = $(shell echo $(ERLANG_BIN) | rev | cut -d "/" -f 2 | rev)
+OTP_VER          = $(shell erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell)
 REBAR           ?= $(BASE_DIR)/rebar3
 OVERLAY_VARS    ?=
-TEST_IGNORE     ?= lager riak basho_bench
+TEST_IGNORE     ?= riak basho_bench
 TEST_DEPS_DIR   ?= _build/test/lib
 REL_DIR         ?= _build/default/rel
 DEPS             = $(patsubst $(TEST_DEPS_DIR)/%, %, $(wildcard $(TEST_DEPS_DIR)/*))
@@ -21,21 +21,17 @@ export EXOMETER_PACKAGES
 
 $(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will probably not work"))
 
-.PHONY: rel stagedevrel deps
+.PHONY: rel stagedevrel
 
-all: deps compile
+all: compile
 
 compile:
 	$(REBAR) compile
 
-deps:
-	$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the compile target"))
-	$(REBAR) upgrade
-
 clean: testclean
 	$(REBAR) clean
 
-distclean: clean devclean relclean ballclean
+distclean: clean devclean relclean
 	@rm -rf _build
 
 ##
@@ -74,20 +70,35 @@ test : testclean eunit test-deps
 ## Release targets
 ##
 rel: compile
-	$(REBAR) as rel release
-	cp -a _build/rel/rel/riak rel/
+	@$(REBAR) as rel release
+# freebsd tar won't write to stdout, so:
+	@tar  -c -f rel.tar --exclude '*/.git/*' -C _build/rel/rel riak && tar -x -f rel.tar -C rel && rm rel.tar
 
 rel-rpm: compile
-	$(REBAR) as rpm release
-	cp -a _build/rpm/rel/riak rel/
+	@$(REBAR) as rpm release
+	@tar --exclude-vcs -c -C _build/rpm/rel riak | tar -x -C rel
 
 rel-deb: compile
-	$(REBAR) as deb release
-	cp -a _build/deb/rel/riak rel/
+	@$(REBAR) as deb release
+	@tar --exclude=vcs -c -C _build/deb/rel riak | tar -x -C rel
+
+rel-osx: compile
+	@$(REBAR) as osx release
+	@tar --exclude=vcs -c -C _build/osx/rel riak | tar -x -C rel
+
+# this one is to be called from an external make (not from rel/pkg/Makefile)
+rel-alpine: compile
+	@$(REBAR) as alpine release
+	@(cd _build/alpine/rel/riak/usr/bin && mv riak-nosu riak)
+	@tar --exclude=vcs -c -C _build/alpine/rel riak | tar -x -C rel
+
+rel-fbsdng: compile
+	@$(REBAR) as fbsdng release
+	@tar  -c -f rel.tar --exclude '*/.git/*' -C _build/fbsdng/rel riak && tar -x -f rel.tar -C rel && rm rel.tar
 
 relclean:
-	rm -rf $(REL_DIR)
-	rm -rf rel/riak
+	@rm -rf $(REL_DIR)
+	@rm -rf rel/riak rel/.libs rel/.deps
 
 ##
 ## Developer targets
@@ -123,7 +134,7 @@ perfdev : all
 	mkdir -p perfdev
 	rel/gen_dev $@ rel/vars/perf_vars.config.src rel/vars/perf_vars.config
 	(cd rel && ../rebar generate target_dir=../perfdev overlay_vars=vars/perf_vars.config)
-	$(foreach dep,$(wildcard deps/*), rm -rf perfdev/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) perfdev/lib;)
+	$(foreach dep,$(wildcard _build/default/lib/*), rm -rf perfdev/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) perfdev/lib;)
 
 perf:
 	perfdev/bin/riak stop || :
@@ -136,7 +147,7 @@ devclean: clean
 	rm -rf dev
 
 stage : rel
-	$(foreach dep,$(wildcard deps/*), rm -rf rel/riak/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) rel/riak/lib;)
+	$(foreach dep,$(wildcard _build/default/lib/*), rm -rf rel/riak/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) rel/riak/lib;)
 
 ##
 ## Doc targets
@@ -231,7 +242,7 @@ PKG_ID := "$(REPO_TAG)-OTP$(OTP_VER)"
 PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//')
 
 package:
-	mkdir rel/pkg/out/riak-$(PKG_ID)
+	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
 

apps/riak/src/riak.app.src

@@ -14,7 +14,6 @@
        riak,
        cuttlefish,
        runtime_tools,
-       lager_syslog,
        cluster_info,
        riak_kv,
        riak_repl,

config/vm.args

@@ -0,0 +1,2 @@
+-setcookie riak
+-name [email protected]

priv/riak.schema

@@ -2,7 +2,7 @@
 
 %% @doc The severity level of the console log, default is 'info'.
 {mapping, "logger.level", "kernel.logger_level", [
-  {default, info},
+  {default, {{logger_level}} },
   {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, none]}}
 ]}.