yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11560 from zmstone/0904-fix-nodetool-patches-dir 

fix(nodetool): ensure patches dir added for rpm/deb installs
This commit is contained in:
Zaiming (Stone) Shi 2023-09-04 17:50:59 +02:00 committed by GitHub
parent 6e4215037c 042c56aa12
commit 885dfe53e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/nodetool
View File

@ -358,7 +358,10 @@ add_libs_dir() ->
%% rel file was been deleted by release handler %% rel file was been deleted by release handler
error({failed_to_read_RELEASES_file, RelFile, Reason}) error({failed_to_read_RELEASES_file, RelFile, Reason})
end, end,
PatchesDir = filename:join([RootDir, "data", "patches"]), ok = add_patches_dir(filename:join([RootDir, "data", "patches"])),
ok = add_patches_dir("/var/lib/emqx/patches").
add_patches_dir(PatchesDir) ->
case filelib:is_dir(PatchesDir) of case filelib:is_dir(PatchesDir) of
true -> true ->
true = code:add_patha(PatchesDir), true = code:add_patha(PatchesDir),

2
deploy/packages/deb/debian/rules
View File

@ -36,8 +36,6 @@ install: build
mkdir -p debian/emqx/usr/lib/emqx/bin mkdir -p debian/emqx/usr/lib/emqx/bin
mkdir -p debian/emqx/usr/lib/emqx/plugins mkdir -p debian/emqx/usr/lib/emqx/plugins
touch debian/emqx/usr/lib/emqx/plugins/.keep touch debian/emqx/usr/lib/emqx/plugins/.keep
mkdir -p debian/emqx/usr/lib/emqx/data/patches
touch debian/emqx/usr/lib/emqx/data/patches/.keep
mkdir -p debian/emqx/etc/emqx mkdir -p debian/emqx/etc/emqx
cp bin/* debian/emqx/usr/lib/emqx/bin cp bin/* debian/emqx/usr/lib/emqx/bin
cp -R lib debian/emqx/usr/lib/emqx cp -R lib debian/emqx/usr/lib/emqx

2
deploy/packages/rpm/emqx.spec
View File

@ -40,7 +40,6 @@ EMQX, a distributed, massively scalable, highly extensible MQTT message broker.
%install %install
mkdir -p %{buildroot}%{_lib_home} mkdir -p %{buildroot}%{_lib_home}
mkdir -p %{buildroot}%{_lib_home}/plugins mkdir -p %{buildroot}%{_lib_home}/plugins
mkdir -p %{buildroot}%{_lib_home}/data/patches
mkdir -p %{buildroot}%{_log_dir} mkdir -p %{buildroot}%{_log_dir}
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_conf_dir} mkdir -p %{buildroot}%{_conf_dir}
@ -49,7 +48,6 @@ mkdir -p %{buildroot}%{_var_home}
cp -R %{_reldir}/lib %{buildroot}%{_lib_home}/ cp -R %{_reldir}/lib %{buildroot}%{_lib_home}/
touch %{buildroot}%{_lib_home}/plugins/.keep touch %{buildroot}%{_lib_home}/plugins/.keep
touch %{buildroot}%{_lib_home}/data/patches/.keep
cp -R %{_reldir}/erts-* %{buildroot}%{_lib_home}/ cp -R %{_reldir}/erts-* %{buildroot}%{_lib_home}/
cp -R %{_reldir}/releases %{buildroot}%{_lib_home}/ cp -R %{_reldir}/releases %{buildroot}%{_lib_home}/
cp -R %{_reldir}/bin %{buildroot}%{_lib_home}/ cp -R %{_reldir}/bin %{buildroot}%{_lib_home}/