Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change to script name in riak-admin to reflect changes in formatting #1148

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Change to script name in riak-admin to reflect changes in formatting #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c3b78f8
find and export VMARGS_PATH
Jan 3, 2023
619eea7
reuse fetched deps in when building freebsd package, too
Jan 9, 2023
65eb9a9
apply patches if any in patches/
Jan 9, 2023
13f88f9
add patch to fix eleveldb build on freebsd
Jan 9, 2023
67cf44e
convince git apply our patches are always good
Jan 9, 2023
420fa19
Revert "reuse fetched deps in when building freebsd package, too"
Jan 9, 2023
8b9a0aa
don't error out if there are no patches
Jan 10, 2023
d28f8de
drop eleveldb freebsd patch
Jan 10, 2023
148a716
use start (not foreground) in unit files (else pipe files are not cre…
Jan 10, 2023
5bd945b
update alpine/vars.config
Jan 10, 2023
d8d22d6
port VMARGS_PATH injection to alpine
Jan 11, 2023
12eb9b8
Update rebar.lock
martinsumner Feb 15, 2023
39bf52c
update alpine build README
hmmr Nov 5, 2023
2dcd2a6
Merge branch 'hmmr/riak-3.2.0/find-that-node' into develop
hmmr Nov 5, 2023
8c2d2f0
Change to script name in riak-admin to reflect changes is formatting
JMercerGit Mar 6, 2024
777e00b
Merge pull request #2 from JMercerGit/develop
hmmr Mar 6, 2024
cbf0790
Merge branch 'develop' of github.com:TI-Tokyo/riak into develop
hmmr May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Expand Up @@ -26,6 +26,10 @@ $(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will
all: compile

compile:
$(REBAR) get-deps
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
Expand Down
3 changes: 2 additions & 1 deletion rebar.config
View file
Open in desktop
Expand Up @@ -16,7 +16,8 @@
]}.

{project_plugins, [
{rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {tag, "0.3.0"}}}
{rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {tag, "0.3.0"}}},
rebar3_sbom
]}.

{cuttlefish, [
Expand Down
2 changes: 1 addition & 1 deletion rel/files/riak-admin
View file
Open in desktop
Expand Up @@ -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)}
Expand Down
1 change: 0 additions & 1 deletion rel/pkg/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions rel/pkg/alpine/README.md
View file
Open in desktop
Expand Up @@ -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/.