From c3b78f83fb12400ff9cc32668708f2377819ecd2 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Tue, 3 Jan 2023 19:56:10 +0200 Subject: [PATCH 01/17] find and export VMARGS_PATH --- rel/files/riak | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rel/files/riak b/rel/files/riak index ccb8fcb8e..1c7c68641 100755 --- a/rel/files/riak +++ b/rel/files/riak @@ -8,6 +8,13 @@ export RUNNER_LOG_DIR={{platform_log_dir}} mkdir -p $PID_DIR chown riak:riak $PID_DIR +# cuttlefish should be doing this, but it doesn't: +VMARGS_PATH=`ls -1 ${RUNNER_GEN_DIR}/generated.conf/vm.*.args 2>/dev/null | tail -1` +if [ ! -r "$VMARGS_PATH" ]; then + VMARGS_PATH="{{platform_base_dir}}/releases/{{rel_vsn}}/vm.args" +fi +export VMARGS_PATH + # centos7-based distros have a su that contacts pam and prints the "Last logged in" message if [ "`cat /etc/redhat-release 2>&1`" = "CentOS Stream release 7" ] || [ "`cat /etc/system-release 2>&1`" = "Amazon Linux release 2 (Karoo)" ]; then From 619eea7371608b18ed07b59ae81d39fa1b277ce3 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Mon, 9 Jan 2023 20:51:53 +0000 Subject: [PATCH 02/17] reuse fetched deps in when building freebsd package, too --- rel/pkg/fbsdng/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rel/pkg/fbsdng/Makefile b/rel/pkg/fbsdng/Makefile index 82887ad63..0f259a34e 100644 --- a/rel/pkg/fbsdng/Makefile +++ b/rel/pkg/fbsdng/Makefile @@ -97,6 +97,8 @@ $(BUILD_STAGE_DIR): buildrel # * copy the vars.config over for build config buildrel: tar -xf $(BASE_DIR)/rel/pkg/out/$(PKG_ID).tar.gz -C $(BASE_DIR)/rel/pkg/out/$(PKG_ID) + cd $(BASE_DIR)/rel/pkg/out/$(PKG_ID); \ + (mkdir -p _build/default && cd _build/default && for d in lib; do ln -fs $(BASE_DIR)/_build/default/$$d; done); \ $(MAKE) -C $(BASE_DIR)/rel/pkg/out/$(PKG_ID) rel-fbsdng rm -rf rel/riak/lib/*/c_src rel/riak/lib/*/src chmod 0755 rel/riak/bin/* rel/riak/erts-*/bin/* From 65eb9a95f6e25bdf7f3bbd8756e1b3886a88f4ae Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Mon, 9 Jan 2023 20:15:48 +0000 Subject: [PATCH 03/17] apply patches if any in patches/ --- Makefile | 2 ++ rel/pkg/Makefile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 844e7070c..0b57ed56c 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,8 @@ $(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will all: compile compile: + $(REBAR) get-deps + ls patches/*.patch | xargs cat | git apply $(REBAR) compile clean: testclean diff --git a/rel/pkg/Makefile b/rel/pkg/Makefile index 575924269..2b1f9ca86 100644 --- a/rel/pkg/Makefile +++ b/rel/pkg/Makefile @@ -5,7 +5,6 @@ export OS = $(shell uname -s) ERLANG_BIN ?= $(shell dirname $(shell which erl)) -DEPS_DIR ?= deps ## ## Support RPM and Debian based linux systems From 13f88f9c55b9b87f52a1aaf3901104214364c0c6 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Mon, 9 Jan 2023 20:16:38 +0000 Subject: [PATCH 04/17] add patch to fix eleveldb build on freebsd --- patches/00-eleveldb-freebsd.patch | 79 +++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 patches/00-eleveldb-freebsd.patch diff --git a/patches/00-eleveldb-freebsd.patch b/patches/00-eleveldb-freebsd.patch new file mode 100644 index 000000000..11393b21b --- /dev/null +++ b/patches/00-eleveldb-freebsd.patch @@ -0,0 +1,79 @@ +diff --git a/_build/default/lib/eleveldb/Makefile b/_build/default/lib/eleveldb/Makefile +index b0d0068..98a0fe7 100644 +--- a/_build/default/lib/eleveldb/Makefile ++++ b/_build/default/lib/eleveldb/Makefile +@@ -1,12 +1,9 @@ +-.PHONY: compile rel cover test dialyzer get-deps ++.PHONY: compile rel cover test dialyzer + REBAR=./rebar3 + + all: compile + +-get-deps: +- $(REBAR) get-deps +- +-compile: get-deps ++compile: + $(REBAR) compile + + clean: +diff --git a/_build/default/lib/eleveldb/c_src/Makefile b/_build/default/lib/eleveldb/c_src/Makefile +index 8de7e33..b9b1b46 100644 +--- a/_build/default/lib/eleveldb/c_src/Makefile ++++ b/_build/default/lib/eleveldb/c_src/Makefile +@@ -21,8 +21,8 @@ compile: get-deps snappy ldb + cp leveldb/perf_dump leveldb/sst_rewrite leveldb/sst_scan leveldb/leveldb_repair ../priv + + ldb: +- $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb all +- $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb tools ++ $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy -lpthread" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb all ++ $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy -lpthread" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb tools + + snappy: system/lib/libsnappy.a + +@@ -31,7 +31,7 @@ system/lib/libsnappy.a: + (cd snappy-$(SNAPPY_VSN) && \ + git submodule update --init && \ + if [ -r autogen.sh ]; then \ +- ./autogen.sh && ./configure --prefix=$(BASEDIR)/system && make && make install; \ ++ ./autogen.sh && ./configure --prefix=$(BASEDIR)/system && $(MAKE) && $(MAKE) install; \ + else \ + mkdir build && cd build && \ + mkdir -p $(BASEDIR)/system && \ +@@ -39,7 +39,7 @@ system/lib/libsnappy.a: + -D CMAKE_INSTALL_PREFIX=$(BASEDIR)/system \ + ..; \ + fi && \ +- make && make install) ++ $(MAKE) && $(MAKE) install) + mv system/lib64 system/lib || true + + clean: +diff --git a/_build/default/lib/eleveldb/make b/_build/default/lib/eleveldb/make +new file mode 100755 +index 0000000..fcda4c3 +--- /dev/null ++++ b/_build/default/lib/eleveldb/make +@@ -0,0 +1,6 @@ ++#!/bin/bash ++ ++which gmake 1>/dev/null 2>/dev/null && MAKE=gmake ++MAKE=${MAKE:-make} ++ ++$MAKE $@ +diff --git a/_build/default/lib/eleveldb/rebar.config b/_build/default/lib/eleveldb/rebar.config +index 200b16d..8ec3579 100644 +--- a/_build/default/lib/eleveldb/rebar.config ++++ b/_build/default/lib/eleveldb/rebar.config +@@ -36,7 +36,7 @@ + {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"} + ]}. + +-{pre_hooks, [{'get-deps', "make -C c_src get-deps"}, +- {compile, "make -C c_src compile"}]}. ++{pre_hooks, [{'get-deps', "./make -C c_src get-deps"}, ++ {compile, "./make -C c_src compile"}]}. + +-{post_hooks, [{clean, "make -C c_src clean"}]}. ++{post_hooks, [{clean, "./make -C c_src clean"}]}. From 67cf44e00751e317a5f4f729fdfcc7b155ba89fe Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Mon, 9 Jan 2023 21:18:41 +0000 Subject: [PATCH 05/17] convince git apply our patches are always good --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b57ed56c..93a144547 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ all: compile compile: $(REBAR) get-deps - ls patches/*.patch | xargs cat | git apply + ls patches/*.patch | xargs cat | GIT_WORK_TREE=. git apply -v --unsafe-paths $(REBAR) compile clean: testclean From 420fa19424f9c681d7bbce9d5400e01c9767ae76 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Mon, 9 Jan 2023 22:50:35 +0000 Subject: [PATCH 06/17] Revert "reuse fetched deps in when building freebsd package, too" This reverts commit 619eea7371608b18ed07b59ae81d39fa1b277ce3. --- rel/pkg/fbsdng/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/rel/pkg/fbsdng/Makefile b/rel/pkg/fbsdng/Makefile index 0f259a34e..82887ad63 100644 --- a/rel/pkg/fbsdng/Makefile +++ b/rel/pkg/fbsdng/Makefile @@ -97,8 +97,6 @@ $(BUILD_STAGE_DIR): buildrel # * copy the vars.config over for build config buildrel: tar -xf $(BASE_DIR)/rel/pkg/out/$(PKG_ID).tar.gz -C $(BASE_DIR)/rel/pkg/out/$(PKG_ID) - cd $(BASE_DIR)/rel/pkg/out/$(PKG_ID); \ - (mkdir -p _build/default && cd _build/default && for d in lib; do ln -fs $(BASE_DIR)/_build/default/$$d; done); \ $(MAKE) -C $(BASE_DIR)/rel/pkg/out/$(PKG_ID) rel-fbsdng rm -rf rel/riak/lib/*/c_src rel/riak/lib/*/src chmod 0755 rel/riak/bin/* rel/riak/erts-*/bin/* From 8b9a0aa9b24cb44147757c21f0136d7dc1e12841 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Tue, 10 Jan 2023 20:57:29 +0200 Subject: [PATCH 07/17] don't error out if there are no patches --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93a144547..e9bf8203e 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,9 @@ all: compile compile: $(REBAR) get-deps - ls patches/*.patch | xargs cat | GIT_WORK_TREE=. git apply -v --unsafe-paths + if ls patches/*.patch 2>/dev/null; then \ + ls patches/*.patch | xargs cat | GIT_WORK_TREE=. git apply -v --unsafe-paths; \ + fi $(REBAR) compile clean: testclean From d28f8deac10fd0553524bed66950c2c22ba61ec5 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Tue, 10 Jan 2023 20:58:02 +0200 Subject: [PATCH 08/17] drop eleveldb freebsd patch --- patches/00-eleveldb-freebsd.patch | 79 ------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 patches/00-eleveldb-freebsd.patch diff --git a/patches/00-eleveldb-freebsd.patch b/patches/00-eleveldb-freebsd.patch deleted file mode 100644 index 11393b21b..000000000 --- a/patches/00-eleveldb-freebsd.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/_build/default/lib/eleveldb/Makefile b/_build/default/lib/eleveldb/Makefile -index b0d0068..98a0fe7 100644 ---- a/_build/default/lib/eleveldb/Makefile -+++ b/_build/default/lib/eleveldb/Makefile -@@ -1,12 +1,9 @@ --.PHONY: compile rel cover test dialyzer get-deps -+.PHONY: compile rel cover test dialyzer - REBAR=./rebar3 - - all: compile - --get-deps: -- $(REBAR) get-deps -- --compile: get-deps -+compile: - $(REBAR) compile - - clean: -diff --git a/_build/default/lib/eleveldb/c_src/Makefile b/_build/default/lib/eleveldb/c_src/Makefile -index 8de7e33..b9b1b46 100644 ---- a/_build/default/lib/eleveldb/c_src/Makefile -+++ b/_build/default/lib/eleveldb/c_src/Makefile -@@ -21,8 +21,8 @@ compile: get-deps snappy ldb - cp leveldb/perf_dump leveldb/sst_rewrite leveldb/sst_scan leveldb/leveldb_repair ../priv - - ldb: -- $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb all -- $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb tools -+ $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy -lpthread" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb all -+ $(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy -lpthread" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb tools - - snappy: system/lib/libsnappy.a - -@@ -31,7 +31,7 @@ system/lib/libsnappy.a: - (cd snappy-$(SNAPPY_VSN) && \ - git submodule update --init && \ - if [ -r autogen.sh ]; then \ -- ./autogen.sh && ./configure --prefix=$(BASEDIR)/system && make && make install; \ -+ ./autogen.sh && ./configure --prefix=$(BASEDIR)/system && $(MAKE) && $(MAKE) install; \ - else \ - mkdir build && cd build && \ - mkdir -p $(BASEDIR)/system && \ -@@ -39,7 +39,7 @@ system/lib/libsnappy.a: - -D CMAKE_INSTALL_PREFIX=$(BASEDIR)/system \ - ..; \ - fi && \ -- make && make install) -+ $(MAKE) && $(MAKE) install) - mv system/lib64 system/lib || true - - clean: -diff --git a/_build/default/lib/eleveldb/make b/_build/default/lib/eleveldb/make -new file mode 100755 -index 0000000..fcda4c3 ---- /dev/null -+++ b/_build/default/lib/eleveldb/make -@@ -0,0 +1,6 @@ -+#!/bin/bash -+ -+which gmake 1>/dev/null 2>/dev/null && MAKE=gmake -+MAKE=${MAKE:-make} -+ -+$MAKE $@ -diff --git a/_build/default/lib/eleveldb/rebar.config b/_build/default/lib/eleveldb/rebar.config -index 200b16d..8ec3579 100644 ---- a/_build/default/lib/eleveldb/rebar.config -+++ b/_build/default/lib/eleveldb/rebar.config -@@ -36,7 +36,7 @@ - {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"} - ]}. - --{pre_hooks, [{'get-deps', "make -C c_src get-deps"}, -- {compile, "make -C c_src compile"}]}. -+{pre_hooks, [{'get-deps', "./make -C c_src get-deps"}, -+ {compile, "./make -C c_src compile"}]}. - --{post_hooks, [{clean, "make -C c_src clean"}]}. -+{post_hooks, [{clean, "./make -C c_src clean"}]}. From 148a716b4188febb5febde7901237990d6e59a3d Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Tue, 10 Jan 2023 22:29:30 +0200 Subject: [PATCH 09/17] use start (not foreground) in unit files (else pipe files are not created) --- rel/pkg/deb/debian/riak.riak.service | 2 +- rel/pkg/rpm/riak.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rel/pkg/deb/debian/riak.riak.service b/rel/pkg/deb/debian/riak.riak.service index a27623097..3ca055367 100644 --- a/rel/pkg/deb/debian/riak.riak.service +++ b/rel/pkg/deb/debian/riak.riak.service @@ -3,7 +3,7 @@ Description=Riak KV Database [Service] User=riak -ExecStart=/usr/sbin/riak foreground +ExecStart=/usr/sbin/riak start ExecStop=/usr/sbin/riak stop Type=simple PIDFile=/run/riak/riak.pid diff --git a/rel/pkg/rpm/riak.service b/rel/pkg/rpm/riak.service index a27623097..3ca055367 100644 --- a/rel/pkg/rpm/riak.service +++ b/rel/pkg/rpm/riak.service @@ -3,7 +3,7 @@ Description=Riak KV Database [Service] User=riak -ExecStart=/usr/sbin/riak foreground +ExecStart=/usr/sbin/riak start ExecStop=/usr/sbin/riak stop Type=simple PIDFile=/run/riak/riak.pid From 5bd945baeca9d09ae113092d3e207fb6f2b728b1 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Tue, 10 Jan 2023 14:19:29 +0200 Subject: [PATCH 10/17] update alpine/vars.config --- rel/pkg/alpine/vars.config | 48 +++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/rel/pkg/alpine/vars.config b/rel/pkg/alpine/vars.config index ac458ed1a..50852e433 100644 --- a/rel/pkg/alpine/vars.config +++ b/rel/pkg/alpine/vars.config @@ -3,34 +3,44 @@ {rel_vsn, "{{release_version}}"}. -{platform_base_dir, "/usr/lib/riak"}. -{platform_bin_dir, "/usr/lib/riak/bin"}. -{platform_data_dir, "/var/lib/riak"}. -{platform_etc_dir, "/etc/riak"}. -{platform_lib_dir, "/usr/lib/riak/lib"}. -{platform_log_dir, "/var/log/riak"}. -{platform_gen_dir, "/var/lib/riak/releases"}. +%% Platform-specific installation paths +{platform_bin_dir, "/usr/lib/riak/bin"}. +{platform_data_dir, "/var/lib/riak"}. +{platform_etc_dir, "/etc/riak"}. +{platform_base_dir, "/usr/lib/riak"}. +{platform_lib_dir, "/usr/lib/riak/lib"}. +{platform_log_dir, "/var/log/riak"}. +{platform_gen_dir, "/var/lib/riak"}. {platform_patch_dir, "/usr/lib/riak/lib/patches"}. {pid_dir, "/run/riak"}. -{web_ip, "127.0.0.1"}. -{web_port, 8098}. {cluster_manager_ip, "127.0.0.1"}. {cluster_manager_port, 9080}. -{handoff_port, 8099}. -{handoff_ip, "0.0.0.0"}. -{pb_ip, "127.0.0.1"}. -{pb_port, 8087}. + +{web_ip, "127.0.0.1"}. +{web_port, 8098}. +{handoff_ip, "0.0.0.0"}. +{handoff_port, 8099}. +{pb_ip, "127.0.0.1"}. +{pb_port, 8087}. + {storage_backend, "bitcask"}. + {sasl_error_log, "{{platform_log_dir}}/sasl-error.log"}. {sasl_log_dir, "{{platform_log_dir}}/sasl"}. -{repl_data_root, "{{platform_data_dir}}/riak_repl/"}. - -{console_log_default, file}. - -{node, "riak@127.0.0.1"}. -{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}. +{repl_data_root, "{{platform_data_dir}}/riak_repl"}. +{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}. +%% +%% cuttlefish +%% {cuttlefish, "on"}. {cuttlefish_conf, "riak.conf"}. + +{logger_level, info}. + +%% +%% etc/vm.args +%% +{node, "riak@127.0.0.1"}. From d8d22d6511a5162bc0e4bc9dafd5db112f12d443 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Wed, 11 Jan 2023 22:00:04 +0200 Subject: [PATCH 11/17] port VMARGS_PATH injection to alpine --- rel/pkg/alpine/riak-nosu | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rel/pkg/alpine/riak-nosu b/rel/pkg/alpine/riak-nosu index db161ad33..e1203b859 100755 --- a/rel/pkg/alpine/riak-nosu +++ b/rel/pkg/alpine/riak-nosu @@ -4,6 +4,13 @@ RUNNER_GEN_DIR={{platform_gen_dir}} RELX_RIAK={{platform_bin_dir}}/riak export PID_DIR={{pid_dir}} +# cuttlefish should be doing this, but it doesn't: +VMARGS_PATH=`ls -1 ${RUNNER_GEN_DIR}/generated.conf/vm.*.args 2>/dev/null | tail -1` +if [ ! -r "$VMARGS_PATH" ]; then + VMARGS_PATH="{{platform_base_dir}}/releases/{{rel_vsn}}/vm.args" +fi +export VMARGS_PATH + mkdir -p $PID_DIR case "$1" in From 12eb9b85ea214289b68ff8cc613df03288e7dd76 Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Wed, 15 Feb 2023 18:14:03 +0000 Subject: [PATCH 12/17] Update rebar.lock --- rebar.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.lock b/rebar.lock index fbe675efe..fa52eb636 100644 --- a/rebar.lock +++ b/rebar.lock @@ -146,7 +146,7 @@ 1}, {<<"webmachine">>, {git,"https://github.com/webmachine/webmachine.git", - {ref,"9e07e439cbbe95c0e0bed137b183a4fb70fd3e0c"}}, + {ref,"33f83f5db0d3a578ef607d4d5aecabeb9ba2cdf0"}}, 2}]}. [ {pkg_hash,[ From 39bf52c7b040972e6f6bc4028a0f40d233aa71c9 Mon Sep 17 00:00:00 2001 From: Andriy Zavada Date: Sun, 5 Nov 2023 22:03:45 +0200 Subject: [PATCH 13/17] update alpine build README --- rel/pkg/alpine/README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/rel/pkg/alpine/README.md b/rel/pkg/alpine/README.md index f1db1d4fc..44a9eb8c5 100644 --- a/rel/pkg/alpine/README.md +++ b/rel/pkg/alpine/README.md @@ -6,9 +6,6 @@ Packaging instructions for Alpine cannot be placed in rel/pkg/alpine/Makefile without bending too many rules and conventions. -Instead, the aim is to have the APKBUILDs for -[riak](https://gitlab.alpinelinux.org/hmmr/aports/-/commit/9a4f91c2f5336a492520c0ae774b95f088a09f96) -(as well as for -[erlang-22](https://gitlab.alpinelinux.org/hmmr/aports/-/commit/0f1eaabe0112f82e8e5acec6dc0fb826b2114858)) -merged into the official "community" repo. This file will be updated -once it is done. +Instead, TI Tokyo [builds](https://github.com/TI-Tokyo/alpine-builds) +apks for x86_64 and aarch64 and maintains an external Alpine +repository at https://files.tiot.jp/alpine/. From 8c2d2f0fc3892c7f117f286092154b0677ea999f Mon Sep 17 00:00:00 2001 From: James M <35449344+JMercerGit@users.noreply.github.com> Date: Wed, 6 Mar 2024 10:46:06 +0000 Subject: [PATCH 14/17] Change to script name in riak-admin to reflect changes is formatting Change to script name in riak-admin to reflect changes is formatting - to ensure consistency with `riak admin` --- rel/files/riak-admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rel/files/riak-admin b/rel/files/riak-admin index 2f0d8f484..006d10ca9 100755 --- a/rel/files/riak-admin +++ b/rel/files/riak-admin @@ -3,7 +3,7 @@ # ex: ts=4 sw=4 et # Identify the script name -SCRIPT="riak-admin" +SCRIPT="riak admin" PLATFORM_BASE_DIR={{platform_base_dir}} PLATFORM_BASE_DIR=${PLATFORM_BASE_DIR:-$(cd $(dirname "$0")/.. && pwd -P)} From c9ffd9764784ecd9ea511aed98d5caa987eee555 Mon Sep 17 00:00:00 2001 From: Andriy Zavada Date: Wed, 4 Sep 2024 16:20:29 +0300 Subject: [PATCH 15/17] drop logrotate from pkg/debian (logs rotated internally) --- rel/pkg/deb/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rel/pkg/deb/debian/control b/rel/pkg/deb/debian/control index 0c62f3356..60457aec9 100644 --- a/rel/pkg/deb/debian/control +++ b/rel/pkg/deb/debian/control @@ -8,6 +8,6 @@ Homepage: riak.com Package: riak Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, logrotate, sudo +Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, sudo Homepage: riak.com Description: Riak KV Database From c799f2071334abaa249ba262d9072e62d2c00719 Mon Sep 17 00:00:00 2001 From: Andriy Zavada Date: Wed, 4 Sep 2024 16:20:55 +0300 Subject: [PATCH 16/17] include bom.xml --- bom.xml | 1 + 1 file changed, 1 insertion(+) create mode 100644 bom.xml diff --git a/bom.xml b/bom.xml new file mode 100644 index 000000000..cb76f7294 --- /dev/null +++ b/bom.xml @@ -0,0 +1 @@ +getopt1.0.2Command-line options parser for ErlangBSDpkg:github/martinsumner/getopt@5d2b27dab5d31669764dc759e44c2d96cac01a4ebear1.0.0A set of statistics functions for erlangApache-2.0pkg:hex/bear@1.0.0157b67901adf84ff0da6eae035ca1292a0ac18aa55148154d8c582b2c68959dbsetup2.1.0Generic setup application for Erlang-based systemsApache-2.0pkg:hex/setup@2.1.0efd072578f0cf85bea96caaffc7adb0992398272522660a136e10567377071c5parse_trans3.4.1Parse transform libraryApache-2.0pkg:hex/parse_trans@3.4.1620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49alz40.2.2LZ4 Compression Librarypkg:github/martinsumner/erlang-lz4@d407af5de71303b8e381df718d2e5d05eb775c59hut1.3.0helper library for making Erlang libraries logging framework agnosticMITpkg:hex/hut@1.3.07e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563folsom1.0.0Erlang based metrics systemApache-2.0pkg:hex/folsom@1.0.0dd6ab97278e94f9e4cfc43e188224a7b8c7eaec0dd2e935007005177f3eebb0ecuttlefish3.0.1cuttlefish configuration abstractionApachepkg:github/basho/cuttlefish@cb3df6a917ee93374de2b881e138e3dc6e9bf5cfwebmachine1.11.1+build.668.ref33f83f5webmachineApachepkg:github/webmachine/webmachine@33f83f5db0d3a578ef607d4d5aecabeb9ba2cdf0riakc3.0.8+p1+build.915.refa48bc72Riak Clientpkg:github/basho/riak-erlang-client@a48bc7252918b87ee1b52355c319fc51dfbc0c4briak_sysmon2.2.0+build.119.refc9640beRate-limiting system_monitor event handlerpkg:github/basho/riak_sysmon@c9640bedc7bc011a10e177922b431b63be661512riak_pb3.0.8+build.595.ref7a5e535Riak Protocol Buffers Messagespkg:github/basho/riak_pb@7a5e535217c13a32f3041888b0d46e9b4476065criak_ensembleriak_kv-3.0.0+build.237.refd57c457Multi-Paxos framework in Erlangpkg:github/basho/riak_ensemble@d57c457ee738a60153d9307a12f4bc86d10c85bdpoolboyriak_kv-3.0.0+build.137.refd775915A hunky Erlang worker pool factorypkg:github/basho/poolboy@d775915c446c9dd251af5bf70e6cfc4beb83d557pbkdf22.1.0+build.2688.ref7e9bd5fcErlang PBKDF2 Key Derivation Functionpkg:github/basho/erlang-pbkdf2@7e9bd5fcd3cc3062159e4c9214bb628aa6feb5camochiweb3.0.0MochiMedia Web ServerMITpkg:github/basho/mochiweb@adb632e96d0256fdb9e4c22c3523dbd7d98c4ec1leveled1.0.4+build.1602.refe06d2a5Key Value store based on LSM-Tree and designed for larger valuesApachepkg:github/martinsumner/leveled@e06d2a538fac9669145f1d226ff049d1ab1f9294ibrowse4.4.2Erlang HTTP client applicationGPLv2BSDpkg:github/basho/ibrowse@076be16d0dcff768aa885d98a23bb3e980e79060exometer_core1.6.1Code instrumentation and metrics collection package.MPL-2.0pkg:github/feuerlabs/exometer_core@66c287e24ceff337f622e3f58e0b4a3ab9ced0f0eleveldbriak_kv-3.0.0+build.697.ref6c0d5bfErlang wrapper to Basho-modified leveldb storepkg:github/basho/eleveldb@6c0d5bf16b84d06609e272dd6803d4537c24cf42clique0.3.11+build.199.ref3929fa5A CLI library for ErlangApache-2.0pkg:github/basho/clique@3929fa5aeed341b407e16479626ff6b9dddf2ea3basho_stats1.1.0+build.53.ref3b33ac1Basic Erlang statistics libraryApache-2.0pkg:github/basho/basho_stats@3b33ac15e11cc88e2fc676a1e2d31b80bd02bea6sidejob2.1.0+build.61.ref10abce4Parallel worker and capacity limiting librarypkg:github/basho/sidejob@10abce4fc76054c8aad230943b5c1a31b67efc6fsext1.8.0Sortable serialization libraryApache-2.0pkg:github/uwiger/sext@c1d93beae5a2d9448a520c31adcb0053c76ef4dfriak_piperiak_kv-3.0.9+build.394.ref63b8660Riak Pipelinepkg:github/basho/riak_pipe@63b866011859bc3f774c9a0d477b5faa34de41d9riak_dtriak_kv-3.0.0+build.342.ref1085511Riak datatype librarypkg:github/basho/riak_dt@10855112980da92632c4604430dc707b79af3e42riak_coreriak_kv-3.0.9+build.2075.refdfcc27aRiak Corepkg:github/basho/riak_core@dfcc27ad86e3f28a01e6653d1e7fd2e02cd35591riak_apiriak_kv-3.0.9+build.370.refd69bcdbRiak Client APIspkg:github/basho/riak_api@d69bcdbc37801a1e9d3a6a1c59ec08e19b9b1485rhc3.0.8+build.258.ref8897851Riak HTTP Clientpkg:github/basho/riak-erlang-http-client@889785140621a02e2cd206b701f59341ad48eb46redbug2.0.7Erlang Tracing DebuggerMITpkg:github/massemanet/redbug@09ee7142f0fcab99151efb1fc405a067f1b15b56recon2.5.2Diagnostic tools for production useBSDpkg:github/ferd/recon@34194da6d9f8ed25f274e0ebb098dc9e95bcf547ranch1.8.0Socket acceptor pool for TCP protocols.pkg:github/ninenines/ranch@a692f44567034dacf5efcaa24a24183788594eb7kv_index_tictactree0.9.19+build.282.ref493f94bAAE helper service for KV vnodeApachepkg:github/martinsumner/kv_index_tictactree@493f94ba24028d823772665c244d33728eca2a6ehyper1.0HyperLogLogpkg:github/basho/hyper@d0bf3d67fd17b8ed2610b266aebd54b1027ea916ebloom2.0.0A NIF wrapper around a basic bloom filterpkg:github/basho/ebloom@3c25f9ef61a73d5f1d2c2601da464dd03975721dcanola2.1.0+build.15.ref2507f69PAM port for Erlangpkg:github/basho/canola@2507f698b4dc1156b07dbf568fc651730942fe73bitcask2.0.3Yet another key/value storage enginepkg:github/basho/bitcask@d84c8d913713da8f02403431217405f84ee1ba22riak_replriak_kv-3.0.9+build.1953.reff27f74eEnterprise replication for Riakpkg:github/basho/riak_repl@f27f74ed88465ba440c7118b2e8f8d10e460a4f9riak_kvriak_kv-3.0.9+build.3962.ref1d4ee470Riak Key/Value Storepkg:github/basho/riak_kv@1d4ee4700f9070a39260010e369f46754df7c850riak_auth_modsriak_kv-3.0.0+build.23.refc9b88eaThird party authentication modules for Riakpkg:github/basho/riak_auth_mods@c9b88ea685e3fe7f327aaeeda207ea3fed7883cdcluster_info2.1.0+build.110.ref55b12ebCluster info/postmortem apppkg:github/basho/cluster_info@55b12ebb60883766fd0077dac43b266fb5eb6c69 \ No newline at end of file From caf8ac349d7f9f9d6b7de9325d4a93ff9ac49356 Mon Sep 17 00:00:00 2001 From: Andriy Zavada Date: Sun, 3 Nov 2024 14:53:09 +0200 Subject: [PATCH 17/17] Fix passing of empty string arg to riak rpc in riak admin services --- rel/files/riak-admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rel/files/riak-admin b/rel/files/riak-admin index 006d10ca9..468a37c27 100755 --- a/rel/files/riak-admin +++ b/rel/files/riak-admin @@ -789,7 +789,7 @@ case "$1" in echo "Lists the services available on the node. See also: wait-for-service" exit 1 fi - rpc riak_core_node_watcher services + rpc_raw riak_core_node_watcher services ;; wait[_-]for[_-]service)