diff --git a/Makefile b/Makefile index 844e7070c..e9bf8203e 100644 --- a/Makefile +++ b/Makefile @@ -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 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 diff --git a/rebar.config b/rebar.config index 7a772b9d3..da47be643 100644 --- a/rebar.config +++ b/rebar.config @@ -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, [ 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)} 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 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/. 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