All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2
@ 2020-01-29 17:26 Frank Vanbever
  2020-01-29 17:26 ` [Buildroot] [PATCH 2/3] package/elixir: new package Frank Vanbever
                   ` (3 more replies)
  0 siblings, 4 replies; 26+ messages in thread
From: Frank Vanbever @ 2020-01-29 17:26 UTC (permalink / raw)
  To: buildroot

The issue fixed by 0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch (ERL-529)
has been fixed since OTP20.3 (a5cbcbdb85) and is no longer required.

OTP provides wrapper scripts (otp_build and configure) which perform tasks
previously handled directly by autotools i.e. autoreconf.

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
My motivation for this version bump is that I want to bump RabbitMQ to the
latest version (3.8.2) which depends on Erlang 21.x or later. There are 2
packages which depend on Erlang that I tested. The test consisted of booting and
ensuring the daemon is running.

- ejabberd:
  daemon starts without issue
- RabbitMQ:
  I encountered an issue where the binaries are installed in
  rabbitmq-0.0.0 but the symlink in /usr/sbin expects them to be in
  rabbitmq-3.6.6. After manually fixing the symlink the daemon started without
  issue. The symlink issue is unrelated to Erlang and does not show up with
  3.8.2 so I did not investigate this further.

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
 ...-with-LDLIBS-instead-of-LIBS-for-DED.patch | 42 -------------------
 package/erlang/erlang.hash                    |  4 +-
 package/erlang/erlang.mk                      | 19 ++++++---
 3 files changed, 16 insertions(+), 49 deletions(-)
 delete mode 100644 package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch

diff --git a/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch
deleted file mode 100644
index ad0bb6b453..0000000000
--- a/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 011752ec7b31e3dde376270fc65c7ee70644f6e7 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet <johan.oudinet@gmail.com>
-Date: Wed, 6 Dec 2017 15:01:17 +0100
-Subject: [PATCH] Link with LDLIBS instead of LIBS for DED
-
-Fix ERL-529 by avoiding to link with libz for no reason.
-
-Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
----
- lib/asn1/c_src/Makefile             | 2 +-
- lib/runtime_tools/c_src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 1f714df357..f7c6b8b9bc 100644
---- a/lib/asn1/c_src/Makefile
-+++ b/lib/asn1/c_src/Makefile
-@@ -126,7 +126,7 @@ $(NIF_LIB_FILE): $(NIF_STATIC_OBJ_FILES)
- 	$(V_RANLIB) $@
- 
- $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
--	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
-+	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LDLIBS)
- 
- # ----------------------------------------------------
- # Release Target
-diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
-index 4530a83aee..4e13e0d789 100644
---- a/lib/runtime_tools/c_src/Makefile.in
-+++ b/lib/runtime_tools/c_src/Makefile.in
-@@ -95,7 +95,7 @@ $(OBJDIR)/%$(TYPEMARKER).o: %.c dyntrace_lttng.h
- 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
- 
- $(LIBDIR)/%$(TYPEMARKER).@DED_EXT@: $(OBJDIR)/%$(TYPEMARKER).o
--	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- clean:
- 	rm -f $(TRACE_LIBS)
--- 
-2.14.1
-
diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash
index 616c85e9ae..3c2f039496 100644
--- a/package/erlang/erlang.hash
+++ b/package/erlang/erlang.hash
@@ -1,4 +1,4 @@
 # md5 from http://www.erlang.org/download/MD5, sha256 locally computed
-md5 350988f024f88e9839c3715b35e7e27a  otp_src_21.0.tar.gz
-sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131  otp_src_21.0.tar.gz
+md5 b2b48dad6e69c1e882843edbf2abcfd3  otp_src_22.2.tar.gz
+sha256 89c2480cdac566065577c82704a48e10f89cf2e6ca5ab99e1cf80027784c678f  otp_src_22.2.tar.gz
 sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE.txt
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index ca0aa0b770..fb26d6589f 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # See note below when updating Erlang
-ERLANG_VERSION = 21.0
+ERLANG_VERSION = 22.2
 ERLANG_SITE = http://www.erlang.org/download
 ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
 ERLANG_DEPENDENCIES = host-erlang
@@ -15,11 +15,20 @@ ERLANG_LICENSE_FILES = LICENSE.txt
 ERLANG_INSTALL_STAGING = YES
 
 # Patched erts/aclocal.m4
-ERLANG_AUTORECONF = YES
+define ERLANG_RUN_AUTOCONF
+	cd $(@D) && PATH=$(BR_PATH) ./otp_build autoconf
+endef
+HOST_ERLANG_DEPENDENCIES = host-autoconf
+ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF
+
+define ERLANG_RUN_SAVE_BOOTSTRAP
+	cd $(@D) && PATH=$(BR_PATH) ./otp_build save_bootstrap
+endef
+ERLANG_POST_CONFIGURE_HOOKS += ERLANG_RUN_SAVE_BOOTSTRAP
 
 # Whenever updating Erlang, this value should be updated as well, to the
 # value of EI_VSN in the file lib/erl_interface/vsn.mk
-ERLANG_EI_VSN = 3.10.3
+ERLANG_EI_VSN = 3.13.1
 
 # The configure checks for these functions fail incorrectly
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
@@ -38,7 +47,7 @@ HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D)
 
 # erlang uses openssl for all things crypto. Since the host tools (such as
 # rebar) uses crypto, we need to build host-erlang with support for openssl.
-HOST_ERLANG_DEPENDENCIES = host-openssl
+HOST_ERLANG_DEPENDENCIES += host-openssl
 HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)
 
 HOST_ERLANG_CONF_OPTS += --without-termcap
@@ -65,7 +74,7 @@ ERLANG_CONF_OPTS += --without-odbc
 endif
 
 # Always use Buildroot's zlib
-ERLANG_CONF_OPTS += --enable-shared-zlib
+ERLANG_CONF_OPTS += --disable-builtin-zlib
 ERLANG_DEPENDENCIES += zlib
 
 # Remove source, example, gs and wx files from staging and target.
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH 2/3] package/elixir: new package
  2020-01-29 17:26 [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Frank Vanbever
@ 2020-01-29 17:26 ` Frank Vanbever
  2020-02-01 22:02   ` Thomas Petazzoni
  2020-01-29 17:26 ` [Buildroot] [PATCH 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 26+ messages in thread
From: Frank Vanbever @ 2020-01-29 17:26 UTC (permalink / raw)
  To: buildroot

elixir is required to build RabbitMQ starting from v3.7

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
 DEVELOPERS                 |  3 +++
 package/elixir/elixir.hash |  3 +++
 package/elixir/elixir.mk   | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/elixir/elixir.hash
 create mode 100644 package/elixir/elixir.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index d5f7bdb8f7..9b9449e285 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -955,6 +955,9 @@ F:	package/ucl/
 F:	package/upx/
 F:	package/zxing-cpp/
 
+N:	Frank Vanbever <frank.vanbever@essensium.com>
+F: 	package/elixir/
+
 N:	Ga?l Portay <gael.portay@collabora.com>
 F:	package/qt5/qt5virtualkeyboard/
 F:	package/qt5/qt5webengine/
diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash
new file mode 100644
index 0000000000..b4d2f8b6b0
--- /dev/null
+++ b/package/elixir/elixir.hash
@@ -0,0 +1,3 @@
+# Computed locally
+sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139  elixir-1.9.4.tar.gz
+sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9  LICENSE
diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk
new file mode 100644
index 0000000000..9c2dd219f8
--- /dev/null
+++ b/package/elixir/elixir.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# elixir
+#
+################################################################################
+
+ELIXIR_VERSION = 1.9.4
+ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION))
+ELIXIR_LICENSE = Apache-2.0
+ELIXIR_LICENSE_FILES = LICENSE
+ELIXIR_DEPENDENCIES = erlang
+
+define HOST_ELIXIR_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile
+endef
+
+define HOST_ELIXIR_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install
+endef
+
+$(eval $(host-generic-package))
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH 3/3] package/rabbitmq-server: bump version to 3.8.2
  2020-01-29 17:26 [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Frank Vanbever
  2020-01-29 17:26 ` [Buildroot] [PATCH 2/3] package/elixir: new package Frank Vanbever
@ 2020-01-29 17:26 ` Frank Vanbever
  2020-02-01 21:59   ` Thomas Petazzoni
  2020-02-01 21:57 ` [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
  2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
  3 siblings, 1 reply; 26+ messages in thread
From: Frank Vanbever @ 2020-01-29 17:26 UTC (permalink / raw)
  To: buildroot

RabbitMQ now depends on Elixir for the build system.
The log directory is required for the server to start with the default
configuration. This behaviour was changed in v3.7 with the move to erlang-lager
as the logging library

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
 package/rabbitmq-server/Config.in             |  5 ++--
 package/rabbitmq-server/S50rabbitmq-server    |  2 ++
 package/rabbitmq-server/rabbitmq-server.hash  | 25 +++++++++++++++-
 package/rabbitmq-server/rabbitmq-server.mk    | 29 ++++++++++---------
 .../rabbitmq-server/rabbitmq-server.service   |  1 +
 5 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/package/rabbitmq-server/Config.in b/package/rabbitmq-server/Config.in
index b3b7639e28..10a7c27d68 100644
--- a/package/rabbitmq-server/Config.in
+++ b/package/rabbitmq-server/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_RABBITMQ_SERVER
 	bool "rabbitmq-server"
 	depends on BR2_PACKAGE_ERLANG
+	select BR2_PACKAGE_HOST_ELIXIR
 	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl
 	                           # applications
@@ -10,5 +11,5 @@ config BR2_PACKAGE_RABBITMQ_SERVER
 
 	  http://www.rabbitmq.com
 
-comment "rabbitmq-server needs erlang"
-	depends on !BR2_PACKAGE_ERLANG
+comment "rabbitmq-server needs erlang and elixir"
+	depends on !BR2_PACKAGE_ERLANG || !BR2_PACKAGE_HOST_ELIXIR
diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server
index faf248ded2..35f7844860 100644
--- a/package/rabbitmq-server/S50rabbitmq-server
+++ b/package/rabbitmq-server/S50rabbitmq-server
@@ -5,10 +5,12 @@
 
 INSTALLUSER=rabbitmq
 RUNDIR=/var/run/rabbitmq
+LOGDIR=/var/log/rabbitmq
 
 case "$1" in
   start)
 	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1
+	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1
         printf "Starting rabbitmq-server: "
         su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null
         [ $? = 0 ] && echo "OK" || echo "FAIL"
diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash
index 3cd412dd0f..6dec4f8af3 100644
--- a/package/rabbitmq-server/rabbitmq-server.hash
+++ b/package/rabbitmq-server/rabbitmq-server.hash
@@ -1,2 +1,25 @@
 # Locally computed
-sha256 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e  rabbitmq-server-3.6.6.tar.xz
+sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d  rabbitmq-server-3.8.2.tar.xz
+sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3  LICENSE
+sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a  LICENSE-APACHE2
+sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe  LICENSE-APACHE2-excanvas
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
+sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
+sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9  LICENSE-BSD-base64js
+sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35  LICENSE-BSD-recon
+sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8  LICENSE-erlcloud
+sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-httpc_aws
+sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689  LICENSE-ISC-cowboy
+sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1  LICENSE-MIT-EJS
+sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
+sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4  LICENSE-MIT-Erlware-Commons
+sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c  LICENSE-MIT-Flot
+sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5  LICENSE-MIT-jQuery
+sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476  LICENSE-MIT-jQuery164
+sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
+sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c  LICENSE-MIT-Sammy
+sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
+sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL
+sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172  LICENSE-MPL2
+sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL-RabbitMQ
+sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-rabbitmq_aws
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index f9c28e6677..7edf649fcd 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -4,20 +4,23 @@
 #
 ################################################################################
 
-RABBITMQ_SERVER_VERSION = 3.6.6
-RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
+RABBITMQ_SERVER_VERSION = 3.8.2
+RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION)
 RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
-RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
-				LICENSE LICENSE-APACHE2-ExplorerCanvas \
-				LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
-				LICENSE-BSD-base64js LICENSE-BSD-glMatrix \
-				LICENSE-EPL-OTP LICENSE-MIT-EJS10 \
-				LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \
-				LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \
-				LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \
-				LICENSE-MPL2
-RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt
+RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC
+RABBITMQ_SERVER_LICENSE_FILES = LICENSE LICENSE-APACHE2 LICENSE-APACHE2-excanvas \
+				LICENSE-APACHE2-ExplorerCanvas LICENSE-APL2-Stomp-Websocket \
+				LICENSE-BSD-base64js LICENSE-BSD-recon LICENSE-erlcloud \
+				LICENSE-httpc_aws LICENSE-ISC-cowboy \
+				LICENSE-MIT-EJS LICENSE-MIT-EJS10 \
+				LICENSE-MIT-Erlware-Commons LICENSE-MIT-Flot \
+				LICENSE-MIT-jQuery LICENSE-MIT-jQuery164 \
+				LICENSE-MIT-Mochi LICENSE-MIT-Sammy \
+				LICENSE-MIT-Sammy060 LICENSE-MPL \
+				LICENSE-MPL2 LICENSE-MPL-RabbitMQ \
+				LICENSE-rabbitmq_aws
+
+RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt
 RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults
 
 define RABBITMQ_SERVER_BUILD_CMDS
diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service
index 268b4bdcd2..f69b33d455 100644
--- a/package/rabbitmq-server/rabbitmq-server.service
+++ b/package/rabbitmq-server/rabbitmq-server.service
@@ -8,6 +8,7 @@ User=rabbitmq
 Group=rabbitmq
 Environment=HOME=/var/lib/rabbitmq
 WorkingDirectory=/var/lib/rabbitmq
+LogsDirectory=/var/log/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl stop
 
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2
  2020-01-29 17:26 [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Frank Vanbever
  2020-01-29 17:26 ` [Buildroot] [PATCH 2/3] package/elixir: new package Frank Vanbever
  2020-01-29 17:26 ` [Buildroot] [PATCH 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
@ 2020-02-01 21:57 ` Thomas Petazzoni
  2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
  3 siblings, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-01 21:57 UTC (permalink / raw)
  To: buildroot

Hello,

Johan: I really would like a Reviewed-by/Acked-by tag from you, as you
are the one typically taking care of erlang support in Buildroot.

On Wed, 29 Jan 2020 18:26:16 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

> The issue fixed by 0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch (ERL-529)
> has been fixed since OTP20.3 (a5cbcbdb85) and is no longer required.
> 
> OTP provides wrapper scripts (otp_build and configure) which perform tasks
> previously handled directly by autotools i.e. autoreconf.
> 
> Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH 3/3] package/rabbitmq-server: bump version to 3.8.2
  2020-01-29 17:26 ` [Buildroot] [PATCH 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
@ 2020-02-01 21:59   ` Thomas Petazzoni
  0 siblings, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-01 21:59 UTC (permalink / raw)
  To: buildroot

On Wed, 29 Jan 2020 18:26:18 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:
> diff --git a/package/rabbitmq-server/Config.in b/package/rabbitmq-server/Config.in
> index b3b7639e28..10a7c27d68 100644
> --- a/package/rabbitmq-server/Config.in
> +++ b/package/rabbitmq-server/Config.in
> @@ -1,6 +1,7 @@
>  config BR2_PACKAGE_RABBITMQ_SERVER
>  	bool "rabbitmq-server"
>  	depends on BR2_PACKAGE_ERLANG
> +	select BR2_PACKAGE_HOST_ELIXIR

There is no BR2_PACKAGE_HOST_ELIXIR option created by your PATCH 2/3,
and that's good as we don't need one. But then you shouldn't reference
one from here.

> -comment "rabbitmq-server needs erlang"
> -	depends on !BR2_PACKAGE_ERLANG
> +comment "rabbitmq-server needs erlang and elixir"
> +	depends on !BR2_PACKAGE_ERLANG || !BR2_PACKAGE_HOST_ELIXIR

This change is also not needed, as BR2_PACKAGE_HOST_ELIXIR doesn't
exist.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH 2/3] package/elixir: new package
  2020-01-29 17:26 ` [Buildroot] [PATCH 2/3] package/elixir: new package Frank Vanbever
@ 2020-02-01 22:02   ` Thomas Petazzoni
  0 siblings, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-01 22:02 UTC (permalink / raw)
  To: buildroot

On Wed, 29 Jan 2020 18:26:17 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

> +ELIXIR_VERSION = 1.9.4
> +ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION))
> +ELIXIR_LICENSE = Apache-2.0
> +ELIXIR_LICENSE_FILES = LICENSE
> +ELIXIR_DEPENDENCIES = erlang

It seems pretty bad/weird for a host package to depend on a target
package. We do have this situation already with host-gcc-final
depending on the target C library package.

Do you really need the target "erlang", and not just "host-erlang" ?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-01-29 17:26 [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Frank Vanbever
                   ` (2 preceding siblings ...)
  2020-02-01 21:57 ` [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
@ 2020-02-04 10:07 ` Frank Vanbever
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 2/3] package/elixir: new package Frank Vanbever
                     ` (3 more replies)
  3 siblings, 4 replies; 26+ messages in thread
From: Frank Vanbever @ 2020-02-04 10:07 UTC (permalink / raw)
  To: buildroot

The issue fixed by 0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch (ERL-529)
has been fixed since OTP20.3 (a5cbcbdb85) and is no longer required.

OTP provides wrapper scripts (otp_build and configure) which perform tasks
previously handled directly by autotools i.e. autoreconf.

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
Changes v1 -> v2:
 - nothing

My motivation for this version bump is that I want to bump RabbitMQ to the
latest version (3.8.2) which depends on Erlang 21.x or later. There are 2
packages which depend on Erlang that I tested. The test consisted of booting and
ensuring the daemon is running.

- ejabberd:
  daemon starts without issue
- RabbitMQ:
  I encountered an issue where the binaries are installed in
  rabbitmq-0.0.0 but the symlink in /usr/sbin expects them to be in
  rabbitmq-3.6.6. After manually fixing the symlink the daemon started without
  issue. The symlink issue is unrelated to Erlang and does not show up with
  3.8.2 so I did not investigate this further.

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
 ...-with-LDLIBS-instead-of-LIBS-for-DED.patch | 42 -------------------
 package/erlang/erlang.hash                    |  4 +-
 package/erlang/erlang.mk                      | 19 ++++++---
 3 files changed, 16 insertions(+), 49 deletions(-)
 delete mode 100644 package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch

diff --git a/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch
deleted file mode 100644
index ad0bb6b453..0000000000
--- a/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 011752ec7b31e3dde376270fc65c7ee70644f6e7 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet <johan.oudinet@gmail.com>
-Date: Wed, 6 Dec 2017 15:01:17 +0100
-Subject: [PATCH] Link with LDLIBS instead of LIBS for DED
-
-Fix ERL-529 by avoiding to link with libz for no reason.
-
-Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
----
- lib/asn1/c_src/Makefile             | 2 +-
- lib/runtime_tools/c_src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 1f714df357..f7c6b8b9bc 100644
---- a/lib/asn1/c_src/Makefile
-+++ b/lib/asn1/c_src/Makefile
-@@ -126,7 +126,7 @@ $(NIF_LIB_FILE): $(NIF_STATIC_OBJ_FILES)
- 	$(V_RANLIB) $@
- 
- $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
--	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
-+	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LDLIBS)
- 
- # ----------------------------------------------------
- # Release Target
-diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
-index 4530a83aee..4e13e0d789 100644
---- a/lib/runtime_tools/c_src/Makefile.in
-+++ b/lib/runtime_tools/c_src/Makefile.in
-@@ -95,7 +95,7 @@ $(OBJDIR)/%$(TYPEMARKER).o: %.c dyntrace_lttng.h
- 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
- 
- $(LIBDIR)/%$(TYPEMARKER).@DED_EXT@: $(OBJDIR)/%$(TYPEMARKER).o
--	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- clean:
- 	rm -f $(TRACE_LIBS)
--- 
-2.14.1
-
diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash
index 616c85e9ae..3c2f039496 100644
--- a/package/erlang/erlang.hash
+++ b/package/erlang/erlang.hash
@@ -1,4 +1,4 @@
 # md5 from http://www.erlang.org/download/MD5, sha256 locally computed
-md5 350988f024f88e9839c3715b35e7e27a  otp_src_21.0.tar.gz
-sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131  otp_src_21.0.tar.gz
+md5 b2b48dad6e69c1e882843edbf2abcfd3  otp_src_22.2.tar.gz
+sha256 89c2480cdac566065577c82704a48e10f89cf2e6ca5ab99e1cf80027784c678f  otp_src_22.2.tar.gz
 sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE.txt
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index ca0aa0b770..fb26d6589f 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # See note below when updating Erlang
-ERLANG_VERSION = 21.0
+ERLANG_VERSION = 22.2
 ERLANG_SITE = http://www.erlang.org/download
 ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
 ERLANG_DEPENDENCIES = host-erlang
@@ -15,11 +15,20 @@ ERLANG_LICENSE_FILES = LICENSE.txt
 ERLANG_INSTALL_STAGING = YES
 
 # Patched erts/aclocal.m4
-ERLANG_AUTORECONF = YES
+define ERLANG_RUN_AUTOCONF
+	cd $(@D) && PATH=$(BR_PATH) ./otp_build autoconf
+endef
+HOST_ERLANG_DEPENDENCIES = host-autoconf
+ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF
+
+define ERLANG_RUN_SAVE_BOOTSTRAP
+	cd $(@D) && PATH=$(BR_PATH) ./otp_build save_bootstrap
+endef
+ERLANG_POST_CONFIGURE_HOOKS += ERLANG_RUN_SAVE_BOOTSTRAP
 
 # Whenever updating Erlang, this value should be updated as well, to the
 # value of EI_VSN in the file lib/erl_interface/vsn.mk
-ERLANG_EI_VSN = 3.10.3
+ERLANG_EI_VSN = 3.13.1
 
 # The configure checks for these functions fail incorrectly
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
@@ -38,7 +47,7 @@ HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D)
 
 # erlang uses openssl for all things crypto. Since the host tools (such as
 # rebar) uses crypto, we need to build host-erlang with support for openssl.
-HOST_ERLANG_DEPENDENCIES = host-openssl
+HOST_ERLANG_DEPENDENCIES += host-openssl
 HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)
 
 HOST_ERLANG_CONF_OPTS += --without-termcap
@@ -65,7 +74,7 @@ ERLANG_CONF_OPTS += --without-odbc
 endif
 
 # Always use Buildroot's zlib
-ERLANG_CONF_OPTS += --enable-shared-zlib
+ERLANG_CONF_OPTS += --disable-builtin-zlib
 ERLANG_DEPENDENCIES += zlib
 
 # Remove source, example, gs and wx files from staging and target.
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/elixir: new package
  2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
@ 2020-02-04 10:07   ` Frank Vanbever
  2020-02-05 14:42     ` Thomas Petazzoni
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
                     ` (2 subsequent siblings)
  3 siblings, 1 reply; 26+ messages in thread
From: Frank Vanbever @ 2020-02-04 10:07 UTC (permalink / raw)
  To: buildroot

elixir is required to build RabbitMQ starting from v3.7

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
Changes v1 -> v2:
 - change dependency from target erlang to host-erlang
---
 DEVELOPERS                 |  1 +
 package/elixir/elixir.hash |  3 +++
 package/elixir/elixir.mk   | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/elixir/elixir.hash
 create mode 100644 package/elixir/elixir.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 23116d2341..3f1ae74df2 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -957,6 +957,7 @@ F:	package/upx/
 F:	package/zxing-cpp/
 
 N:	Frank Vanbever <frank.vanbever@essensium.com>
+F: 	package/elixir/
 F:	package/libmodsecurity/
 F:	package/nginx-modsecurity/
 
diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash
new file mode 100644
index 0000000000..b4d2f8b6b0
--- /dev/null
+++ b/package/elixir/elixir.hash
@@ -0,0 +1,3 @@
+# Computed locally
+sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139  elixir-1.9.4.tar.gz
+sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9  LICENSE
diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk
new file mode 100644
index 0000000000..7a545d43b0
--- /dev/null
+++ b/package/elixir/elixir.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# elixir
+#
+################################################################################
+
+ELIXIR_VERSION = 1.9.4
+ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION))
+ELIXIR_LICENSE = Apache-2.0
+ELIXIR_LICENSE_FILES = LICENSE
+ELIXIR_DEPENDENCIES = host-erlang
+
+define HOST_ELIXIR_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile
+endef
+
+define HOST_ELIXIR_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install
+endef
+
+$(eval $(host-generic-package))
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2
  2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 2/3] package/elixir: new package Frank Vanbever
@ 2020-02-04 10:07   ` Frank Vanbever
  2020-02-05 14:47     ` Thomas Petazzoni
  2020-02-13 15:14     ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Frank Vanbever
  2020-02-05  9:37   ` [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
  2020-02-05 14:42   ` Thomas Petazzoni
  3 siblings, 2 replies; 26+ messages in thread
From: Frank Vanbever @ 2020-02-04 10:07 UTC (permalink / raw)
  To: buildroot

RabbitMQ now depends on Elixir for the build system.
The log directory is required for the server to start with the default
configuration. This behaviour was changed in v3.7 with the move to erlang-lager
as the logging library

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
Changes v1 -> v2:
- Remove reference to BR2_PACKAGE_HOST_ELIXIR
---
 package/rabbitmq-server/S50rabbitmq-server    |  2 +
 package/rabbitmq-server/rabbitmq-server.hash  | 41 +++++++++++--------
 package/rabbitmq-server/rabbitmq-server.mk    | 29 +++++++------
 .../rabbitmq-server/rabbitmq-server.service   |  1 +
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server
index faf248ded2..35f7844860 100644
--- a/package/rabbitmq-server/S50rabbitmq-server
+++ b/package/rabbitmq-server/S50rabbitmq-server
@@ -5,10 +5,12 @@
 
 INSTALLUSER=rabbitmq
 RUNDIR=/var/run/rabbitmq
+LOGDIR=/var/log/rabbitmq
 
 case "$1" in
   start)
 	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1
+	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1
         printf "Starting rabbitmq-server: "
         su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null
         [ $? = 0 ] && echo "OK" || echo "FAIL"
diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash
index 3c552820c1..6dec4f8af3 100644
--- a/package/rabbitmq-server/rabbitmq-server.hash
+++ b/package/rabbitmq-server/rabbitmq-server.hash
@@ -1,18 +1,25 @@
 # Locally computed
-sha256  395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e  rabbitmq-server-3.6.6.tar.xz
-sha256  f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba  LICENSE-MPL-RabbitMQ
-sha256  2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985  LICENSE
-sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
-sha256  809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE-APL2-Rebar
-sha256  b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
-sha256  cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f  LICENSE-BSD-base64js
-sha256  2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1  LICENSE-BSD-glMatrix
-sha256  a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd  LICENSE-EPL-OTP
-sha256  b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
-sha256  e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c  LICENSE-MIT-Flot
-sha256  f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b  LICENSE-MIT-jQuery164
-sha256  fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
-sha256  363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115  LICENSE-MIT-Mochiweb
-sha256  cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
-sha256  c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f  LICENSE-MIT-SockJS
-sha256  fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85  LICENSE-MPL2
+sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d  rabbitmq-server-3.8.2.tar.xz
+sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3  LICENSE
+sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a  LICENSE-APACHE2
+sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe  LICENSE-APACHE2-excanvas
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
+sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
+sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9  LICENSE-BSD-base64js
+sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35  LICENSE-BSD-recon
+sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8  LICENSE-erlcloud
+sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-httpc_aws
+sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689  LICENSE-ISC-cowboy
+sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1  LICENSE-MIT-EJS
+sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
+sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4  LICENSE-MIT-Erlware-Commons
+sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c  LICENSE-MIT-Flot
+sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5  LICENSE-MIT-jQuery
+sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476  LICENSE-MIT-jQuery164
+sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
+sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c  LICENSE-MIT-Sammy
+sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
+sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL
+sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172  LICENSE-MPL2
+sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL-RabbitMQ
+sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-rabbitmq_aws
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index f9c28e6677..7edf649fcd 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -4,20 +4,23 @@
 #
 ################################################################################
 
-RABBITMQ_SERVER_VERSION = 3.6.6
-RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
+RABBITMQ_SERVER_VERSION = 3.8.2
+RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION)
 RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
-RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
-				LICENSE LICENSE-APACHE2-ExplorerCanvas \
-				LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
-				LICENSE-BSD-base64js LICENSE-BSD-glMatrix \
-				LICENSE-EPL-OTP LICENSE-MIT-EJS10 \
-				LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \
-				LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \
-				LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \
-				LICENSE-MPL2
-RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt
+RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC
+RABBITMQ_SERVER_LICENSE_FILES = LICENSE LICENSE-APACHE2 LICENSE-APACHE2-excanvas \
+				LICENSE-APACHE2-ExplorerCanvas LICENSE-APL2-Stomp-Websocket \
+				LICENSE-BSD-base64js LICENSE-BSD-recon LICENSE-erlcloud \
+				LICENSE-httpc_aws LICENSE-ISC-cowboy \
+				LICENSE-MIT-EJS LICENSE-MIT-EJS10 \
+				LICENSE-MIT-Erlware-Commons LICENSE-MIT-Flot \
+				LICENSE-MIT-jQuery LICENSE-MIT-jQuery164 \
+				LICENSE-MIT-Mochi LICENSE-MIT-Sammy \
+				LICENSE-MIT-Sammy060 LICENSE-MPL \
+				LICENSE-MPL2 LICENSE-MPL-RabbitMQ \
+				LICENSE-rabbitmq_aws
+
+RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt
 RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults
 
 define RABBITMQ_SERVER_BUILD_CMDS
diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service
index 268b4bdcd2..f69b33d455 100644
--- a/package/rabbitmq-server/rabbitmq-server.service
+++ b/package/rabbitmq-server/rabbitmq-server.service
@@ -8,6 +8,7 @@ User=rabbitmq
 Group=rabbitmq
 Environment=HOME=/var/lib/rabbitmq
 WorkingDirectory=/var/lib/rabbitmq
+LogsDirectory=/var/log/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl stop
 
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 2/3] package/elixir: new package Frank Vanbever
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
@ 2020-02-05  9:37   ` Thomas Petazzoni
  2020-02-05 11:15     ` Frank Vanbever
  2020-02-05 14:42   ` Thomas Petazzoni
  3 siblings, 1 reply; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-05  9:37 UTC (permalink / raw)
  To: buildroot

Hello Frank,

Thanks for the new iteration. However, one question remains. See below.

On Tue,  4 Feb 2020 11:07:31 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

>  # Patched erts/aclocal.m4
> -ERLANG_AUTORECONF = YES
> +define ERLANG_RUN_AUTOCONF
> +	cd $(@D) && PATH=$(BR_PATH) ./otp_build autoconf
> +endef
> +HOST_ERLANG_DEPENDENCIES = host-autoconf
> +ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF
> +
> +define ERLANG_RUN_SAVE_BOOTSTRAP
> +	cd $(@D) && PATH=$(BR_PATH) ./otp_build save_bootstrap
> +endef

Why is this save_bootstrap now needed ? Looking at HOWTO/INSTALL.md in
the Erlang source code shows:

"""

#### Pre-built Source Release ####

The source release is delivered with a lot of platform independent
build results already pre-built. If you want to remove these pre-built
files, invoke `./otp_build remove_prebuilt_files` from the `$ERL_TOP`
directory. After you have done this, you can build exactly the same way
as before, but the build process will take a much longer time.

> *WARNING*: Doing `make clean` in an arbitrary directory of the source
> tree, may remove files needed for bootstrapping the build.
>
> Doing `./otp_build save_bootstrap` from the `$ERL_TOP` directory before
> doing `make clean` will ensure that it will be possible to build after
> doing `make clean`. `./otp_build save_bootstrap` will be invoked
> automatically when `make` is invoked from `$ERL_TOP` with either the
> `clean` target, or the default target. It is also automatically invoked
> if `./otp_build remove_prebuilt_files` is invoked.
>
> If you need to verify the bootstrap beam files match the provided
> source files, use `./otp_build update_primary` to create a new commit that
> contains differences, if any exist.

"""

Which doesn't really help in understanding why we need to call this
save_bootstrap action in the context of Buildroot. It definitely
warrants an explanation in the commit log and a small comment above the
code. No need to resend a new iteration of the entire patch series,
just give some more details by e-mail, I can amend the patch when
applying.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-05  9:37   ` [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
@ 2020-02-05 11:15     ` Frank Vanbever
  0 siblings, 0 replies; 26+ messages in thread
From: Frank Vanbever @ 2020-02-05 11:15 UTC (permalink / raw)
  To: buildroot

Hello Thomas,

On Wednesday, 5 February 2020 10:37:39 CET Thomas Petazzoni wrote:
> Why is this save_bootstrap now needed ?

During development I encountered build failures due to the following file not 
being present:

    otp_src_22.2/bootstrap/lib/kernel/include/logger.hrl

The save_bootstrap command creates this file.

I attempted to reproduce this build failure today and I am unable to do so.
Likely the behaviour I saw was an artifact of some manipulation I did to fix 
the build rather than inherent to Erlang itself.

AFAICT all lines related to ERLANG_RUN_SAVE_BOOTSTRAP can be removed as they 
serve no purpose. This is as you mention also supported by the Erlang 
documentation.

Given that it's removing code is this still something you can amend during the 
merge or do you want me to resubmit the patches?

Br,
Frank

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
                     ` (2 preceding siblings ...)
  2020-02-05  9:37   ` [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
@ 2020-02-05 14:42   ` Thomas Petazzoni
  2020-02-10 13:28     ` Johan Oudinet
  3 siblings, 1 reply; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-05 14:42 UTC (permalink / raw)
  To: buildroot

Hello Frank,

I've applied your patch, but with some changes. See below.

On Tue,  4 Feb 2020 11:07:31 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

>  # See note below when updating Erlang
> -ERLANG_VERSION = 21.0
> +ERLANG_VERSION = 22.2
>  ERLANG_SITE = http://www.erlang.org/download
>  ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
>  ERLANG_DEPENDENCIES = host-erlang
> @@ -15,11 +15,20 @@ ERLANG_LICENSE_FILES = LICENSE.txt
>  ERLANG_INSTALL_STAGING = YES
>  
>  # Patched erts/aclocal.m4
> -ERLANG_AUTORECONF = YES
> +define ERLANG_RUN_AUTOCONF
> +	cd $(@D) && PATH=$(BR_PATH) ./otp_build autoconf
> +endef
> +HOST_ERLANG_DEPENDENCIES = host-autoconf
> +ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF

ERLANG_AUTORECONF = YES does the thing for both the host and target
packages.

However here, you are adding host-autoconf as a dependency for
host-erlang, but you're doing the autoconf only on the target erlang.
So I fixed that to ensure we add host-autoconf to both target/host
variants of erlang (which is pedantic since anyway erlang depends on
host-erlang) and do the autoconf on both host and target.

> +define ERLANG_RUN_SAVE_BOOTSTRAP
> +	cd $(@D) && PATH=$(BR_PATH) ./otp_build save_bootstrap
> +endef
> +ERLANG_POST_CONFIGURE_HOOKS += ERLANG_RUN_SAVE_BOOTSTRAP

As we discussed, this does not seem to be needed, at least from my
testing, so I dropped this.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/elixir: new package
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 2/3] package/elixir: new package Frank Vanbever
@ 2020-02-05 14:42     ` Thomas Petazzoni
  0 siblings, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-05 14:42 UTC (permalink / raw)
  To: buildroot

On Tue,  4 Feb 2020 11:07:32 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

> elixir is required to build RabbitMQ starting from v3.7
> 
> Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
> ---
> Changes v1 -> v2:
>  - change dependency from target erlang to host-erlang
> ---
>  DEVELOPERS                 |  1 +
>  package/elixir/elixir.hash |  3 +++
>  package/elixir/elixir.mk   | 21 +++++++++++++++++++++
>  3 files changed, 25 insertions(+)
>  create mode 100644 package/elixir/elixir.hash
>  create mode 100644 package/elixir/elixir.mk

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
@ 2020-02-05 14:47     ` Thomas Petazzoni
  2020-02-13 15:14     ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Frank Vanbever
  1 sibling, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-05 14:47 UTC (permalink / raw)
  To: buildroot

Hello Frank,

On Tue,  4 Feb 2020 11:07:33 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

> RabbitMQ now depends on Elixir for the build system.
> The log directory is required for the server to start with the default
> configuration. This behaviour was changed in v3.7 with the move to erlang-lager
> as the logging library
> 
> Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>

Overall this looks good, except for license file hashes.


> diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash
> index 3c552820c1..6dec4f8af3 100644
> --- a/package/rabbitmq-server/rabbitmq-server.hash
> +++ b/package/rabbitmq-server/rabbitmq-server.hash
> @@ -1,18 +1,25 @@
>  # Locally computed
> -sha256  395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e  rabbitmq-server-3.6.6.tar.xz
> -sha256  f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba  LICENSE-MPL-RabbitMQ
> -sha256  2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985  LICENSE
> -sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
> -sha256  809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE-APL2-Rebar
> -sha256  b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
> -sha256  cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f  LICENSE-BSD-base64js
> -sha256  2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1  LICENSE-BSD-glMatrix
> -sha256  a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd  LICENSE-EPL-OTP
> -sha256  b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
> -sha256  e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c  LICENSE-MIT-Flot
> -sha256  f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b  LICENSE-MIT-jQuery164
> -sha256  fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
> -sha256  363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115  LICENSE-MIT-Mochiweb
> -sha256  cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
> -sha256  c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f  LICENSE-MIT-SockJS
> -sha256  fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85  LICENSE-MPL2
> +sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d  rabbitmq-server-3.8.2.tar.xz
> +sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3  LICENSE
> +sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a  LICENSE-APACHE2
> +sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe  LICENSE-APACHE2-excanvas
> +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
> +sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
> +sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9  LICENSE-BSD-base64js
> +sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35  LICENSE-BSD-recon
> +sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8  LICENSE-erlcloud
> +sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-httpc_aws
> +sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689  LICENSE-ISC-cowboy
> +sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1  LICENSE-MIT-EJS
> +sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
> +sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4  LICENSE-MIT-Erlware-Commons
> +sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c  LICENSE-MIT-Flot
> +sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5  LICENSE-MIT-jQuery
> +sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476  LICENSE-MIT-jQuery164
> +sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
> +sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c  LICENSE-MIT-Sammy
> +sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
> +sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL
> +sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172  LICENSE-MPL2
> +sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL-RabbitMQ
> +sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-rabbitmq_aws

Here it's a bit annoying that you change the layout to use one space
between "sha256" and the hash instead of two spaces, since our
more-or-less standard practice is to keep two spaces. Also, it makes it
difficult to see the changes.

Overall, it looks like most if not all of the license file hashes have
changed, and the whole reason of having hashes is to detect when
license terms are modified. So we really want to have an explanation
about why this all changed: which licenses are added, removed, why
license files for existing licenses were changed, etc.

> -RABBITMQ_SERVER_VERSION = 3.6.6
> -RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
> +RABBITMQ_SERVER_VERSION = 3.8.2
> +RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION)
>  RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
> -RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
> -RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
> -				LICENSE LICENSE-APACHE2-ExplorerCanvas \
> -				LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
> -				LICENSE-BSD-base64js LICENSE-BSD-glMatrix \
> -				LICENSE-EPL-OTP LICENSE-MIT-EJS10 \
> -				LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \
> -				LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \
> -				LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \
> -				LICENSE-MPL2
> -RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt
> +RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC
> +RABBITMQ_SERVER_LICENSE_FILES = LICENSE LICENSE-APACHE2 LICENSE-APACHE2-excanvas \
> +				LICENSE-APACHE2-ExplorerCanvas LICENSE-APL2-Stomp-Websocket \
> +				LICENSE-BSD-base64js LICENSE-BSD-recon LICENSE-erlcloud \
> +				LICENSE-httpc_aws LICENSE-ISC-cowboy \
> +				LICENSE-MIT-EJS LICENSE-MIT-EJS10 \
> +				LICENSE-MIT-Erlware-Commons LICENSE-MIT-Flot \
> +				LICENSE-MIT-jQuery LICENSE-MIT-jQuery164 \
> +				LICENSE-MIT-Mochi LICENSE-MIT-Sammy \
> +				LICENSE-MIT-Sammy060 LICENSE-MPL \
> +				LICENSE-MPL2 LICENSE-MPL-RabbitMQ \
> +				LICENSE-rabbitmq_aws

Could we try to keep the license files in the same order as they are
today, as much as possible? Or alternatively (and better) have a
preparation patch before the patch doing the bump that changes this
list to be like this:

RABBITMQ_SERVER_LICENSE_FILES = \
	file1 \
	file2 \
	file3 \
	file4

I.e, one file per line, one tab for indentation, and files ordered
alphabetically. This will more easily allow to review changes made by
the following patch doing the bump.

Is this something you could have a look at ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-05 14:42   ` Thomas Petazzoni
@ 2020-02-10 13:28     ` Johan Oudinet
  2020-02-10 13:30       ` Thomas Petazzoni
  0 siblings, 1 reply; 26+ messages in thread
From: Johan Oudinet @ 2020-02-10 13:28 UTC (permalink / raw)
  To: buildroot

Hi Thomas, Frank, All,

Sorry for the late reply.

On Wed, Feb 5, 2020 at 3:42 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> I've applied your patch, but with some changes. See below.
>
> On Tue,  4 Feb 2020 11:07:31 +0100
> Frank Vanbever <frank.vanbever@essensium.com> wrote:
>
> > +define ERLANG_RUN_SAVE_BOOTSTRAP
> > +     cd $(@D) && PATH=$(BR_PATH) ./otp_build save_bootstrap
> > +endef
> > +ERLANG_POST_CONFIGURE_HOOKS += ERLANG_RUN_SAVE_BOOTSTRAP
>
> As we discussed, this does not seem to be needed, at least from my
> testing, so I dropped this.

I've just tested it, doing a fresh compilation from buildroot/master
and I got the following error:
make[4]: Entering directory
'/home/johan/Documents/buildroot/output/build/erlang-22.2/lib/ssl/src'
make[4]: *** No rule to make target
'../../../bootstrap/lib/kernel/include/logger.hrl', needed by
'../ebin/dtls_connection.beam'.  Stop.

Since Frank said this file is created by the save_bootstrap command, I
guess it is finally required.
-- 
Johan

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 13:28     ` Johan Oudinet
@ 2020-02-10 13:30       ` Thomas Petazzoni
  2020-02-10 15:20         ` Johan Oudinet
  0 siblings, 1 reply; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-10 13:30 UTC (permalink / raw)
  To: buildroot

On Mon, 10 Feb 2020 14:28:14 +0100
Johan Oudinet <johan.oudinet@gmail.com> wrote:

> > As we discussed, this does not seem to be needed, at least from my
> > testing, so I dropped this.  
> 
> I've just tested it, doing a fresh compilation from buildroot/master
> and I got the following error:
> make[4]: Entering directory
> '/home/johan/Documents/buildroot/output/build/erlang-22.2/lib/ssl/src'
> make[4]: *** No rule to make target
> '../../../bootstrap/lib/kernel/include/logger.hrl', needed by
> '../ebin/dtls_connection.beam'.  Stop.
> 
> Since Frank said this file is created by the save_bootstrap command, I
> guess it is finally required.

Frank indeed reported reaching the same error as the one you're seeing
here. However, last week, I also did a fresh build, and did not get
this issue. Weird.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 13:30       ` Thomas Petazzoni
@ 2020-02-10 15:20         ` Johan Oudinet
  2020-02-10 15:27           ` Johan Oudinet
  0 siblings, 1 reply; 26+ messages in thread
From: Johan Oudinet @ 2020-02-10 15:20 UTC (permalink / raw)
  To: buildroot

On Mon, Feb 10, 2020 at 2:30 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Mon, 10 Feb 2020 14:28:14 +0100
> Johan Oudinet <johan.oudinet@gmail.com> wrote:
>
> > > As we discussed, this does not seem to be needed, at least from my
> > > testing, so I dropped this.
> >
> > I've just tested it, doing a fresh compilation from buildroot/master
> > and I got the following error:
> > make[4]: Entering directory
> > '/home/johan/Documents/buildroot/output/build/erlang-22.2/lib/ssl/src'
> > make[4]: *** No rule to make target
> > '../../../bootstrap/lib/kernel/include/logger.hrl', needed by
> > '../ebin/dtls_connection.beam'.  Stop.
> >
> > Since Frank said this file is created by the save_bootstrap command, I
> > guess it is finally required.
>
> Frank indeed reported reaching the same error as the one you're seeing
> here. However, last week, I also did a fresh build, and did not get
> this issue. Weird.

Well, what's strange to me is why the ssl application is looking for
logger.hrl into erlang-22.2/bootstrap/lib/kernel/include. This file is
present in erlang-22.2/lib/kernel/include.
The erlang build system is a real mess to me. If I understand
correctly HOWTO/BOOSTSTRAP.md, the bootstrap directory is supposed to
contain what they call "primary bootstrap" content, which is code
compiled from source files in the lib{kernel,stdlib,compiler}.
I don't think logger.hrl is a compiled source code, it simply defines
a bunch of macros for logging purposes. So to my understanding, the
ssl application shouldn't look for it inside the bootstrap directory.

Investigating further into this issue, I found a strange file that
references logger.hrl from the wrong location: lib/ssl/src/deps/ssl.d
This file is created by the following rule in lib/Makefile:
$(DEP_FILE): $(ERL_FILES)
        $(gen_verbose)erlc -M $(ERL_FILES) \
        | sed "s@$(ERL_TOP)@../../.. at g" \
        | sed "s/\.$(EMULATOR)/\.$$\(EMULATOR\)/" \
        | sed 's@^dtls_@$$(EBIN)/dtls_@' \
        | sed 's@^inet_@$$(EBIN)/inet_@' \
        | sed 's@^ssl_@$$(EBIN)/ssl_@' \
        | sed 's@^tls_@$$(EBIN)/tls_@' \
        > $(DEP_FILE)

The idea to call erlc to generate a set of dependencies while we are
building erlang seems wrong to me... we probably need to bypass this
rule.
Hopefully, this file ssl.d is already present in the archive. So I
think a fix would be to remove bootstrap from the path to logger.hrl
via a sed command before calling make?

This might be a good idea to report this error upstream as well.

-- 
Johan

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 15:20         ` Johan Oudinet
@ 2020-02-10 15:27           ` Johan Oudinet
  2020-02-10 15:51             ` Johan Oudinet
  0 siblings, 1 reply; 26+ messages in thread
From: Johan Oudinet @ 2020-02-10 15:27 UTC (permalink / raw)
  To: buildroot

On Mon, Feb 10, 2020 at 4:20 PM Johan Oudinet <johan.oudinet@gmail.com> wrote:
> Hopefully, this file ssl.d is already present in the archive. So I
> think a fix would be to remove bootstrap from the path to logger.hrl
> via a sed command before calling make?
>
> This might be a good idea to report this error upstream as well.

There is no deps directory inside lib/ssl/src in the last release of
erlang (22.2.6). I guess this was a left over from the guy who made
the archive?
So my fix proposition to simply sed this file won't work in future
erlang versions.
-- 
Johan

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 15:27           ` Johan Oudinet
@ 2020-02-10 15:51             ` Johan Oudinet
  2020-02-10 15:57               ` Thomas Petazzoni
  0 siblings, 1 reply; 26+ messages in thread
From: Johan Oudinet @ 2020-02-10 15:51 UTC (permalink / raw)
  To: buildroot

On Mon, Feb 10, 2020 at 4:27 PM Johan Oudinet <johan.oudinet@gmail.com> wrote:
>
> On Mon, Feb 10, 2020 at 4:20 PM Johan Oudinet <johan.oudinet@gmail.com> wrote:
> > Hopefully, this file ssl.d is already present in the archive. So I
> > think a fix would be to remove bootstrap from the path to logger.hrl
> > via a sed command before calling make?
> >
> > This might be a good idea to report this error upstream as well.
>
> There is no deps directory inside lib/ssl/src in the last release of
> erlang (22.2.6). I guess this was a left over from the guy who made
> the archive?
> So my fix proposition to simply sed this file won't work in future
> erlang versions.

I confirm that removing lib/ssl/src/deps directory fix the build issue
on my machine. I can submit a patch that removes this directory as a
PRE_CONFIGURE hook, what do you think?
-- 
Johan

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 15:51             ` Johan Oudinet
@ 2020-02-10 15:57               ` Thomas Petazzoni
  2020-02-10 16:07                 ` Johan Oudinet
  0 siblings, 1 reply; 26+ messages in thread
From: Thomas Petazzoni @ 2020-02-10 15:57 UTC (permalink / raw)
  To: buildroot

On Mon, 10 Feb 2020 16:51:48 +0100
Johan Oudinet <johan.oudinet@gmail.com> wrote:

> > There is no deps directory inside lib/ssl/src in the last release of
> > erlang (22.2.6). I guess this was a left over from the guy who made
> > the archive?
> > So my fix proposition to simply sed this file won't work in future
> > erlang versions.  
> 
> I confirm that removing lib/ssl/src/deps directory fix the build issue
> on my machine. I can submit a patch that removes this directory as a
> PRE_CONFIGURE hook, what do you think?

Is this an upstream bug, i.e this folder should not be present in the
release tarball?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 15:57               ` Thomas Petazzoni
@ 2020-02-10 16:07                 ` Johan Oudinet
  2020-02-10 16:48                   ` Johan Oudinet
  0 siblings, 1 reply; 26+ messages in thread
From: Johan Oudinet @ 2020-02-10 16:07 UTC (permalink / raw)
  To: buildroot

On Mon, Feb 10, 2020 at 4:57 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Mon, 10 Feb 2020 16:51:48 +0100
> Johan Oudinet <johan.oudinet@gmail.com> wrote:
>
> > > There is no deps directory inside lib/ssl/src in the last release of
> > > erlang (22.2.6). I guess this was a left over from the guy who made
> > > the archive?
> > > So my fix proposition to simply sed this file won't work in future
> > > erlang versions.
> >
> > I confirm that removing lib/ssl/src/deps directory fix the build issue
> > on my machine. I can submit a patch that removes this directory as a
> > PRE_CONFIGURE hook, what do you think?
>
> Is this an upstream bug, i.e this folder should not be present in the
> release tarball?

I think so, yes. This directory has been removed on the next version : 22.2.1
Well, we could also simply bump the version. As a minor release, it
should not require too much effort.
-- 
Johan

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2
  2020-02-10 16:07                 ` Johan Oudinet
@ 2020-02-10 16:48                   ` Johan Oudinet
  0 siblings, 0 replies; 26+ messages in thread
From: Johan Oudinet @ 2020-02-10 16:48 UTC (permalink / raw)
  To: buildroot

On Mon, Feb 10, 2020 at 5:07 PM Johan Oudinet <johan.oudinet@gmail.com> wrote:
>
> On Mon, Feb 10, 2020 at 4:57 PM Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> wrote:
> >
> > Is this an upstream bug, i.e this folder should not be present in the
> > release tarball?
>
> I think so, yes. This directory has been removed on the next version : 22.2.1
> Well, we could also simply bump the version. As a minor release, it
> should not require too much effort.

Actually, they don't put minor releases into their download section.
So I think it is best to patch it as I mentioned it. I've also opened
a bug report about it:
https://bugs.erlang.org/browse/ERL-1168

I'll submit the patch in a few minutes.
-- 
Johan

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list
  2020-02-04 10:07   ` [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
  2020-02-05 14:47     ` Thomas Petazzoni
@ 2020-02-13 15:14     ` Frank Vanbever
  2020-02-13 15:14       ` [Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
  2020-04-12 19:33       ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Thomas Petazzoni
  1 sibling, 2 replies; 26+ messages in thread
From: Frank Vanbever @ 2020-02-13 15:14 UTC (permalink / raw)
  To: buildroot

Moving the licenses to a single file name per line and ensuring they're in
alphabetical order makes it easier to see what changed in case these licenses
change.

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
 package/rabbitmq-server/rabbitmq-server.hash |  2 +-
 package/rabbitmq-server/rabbitmq-server.mk   | 27 +++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash
index 3c552820c1..5ad55b167b 100644
--- a/package/rabbitmq-server/rabbitmq-server.hash
+++ b/package/rabbitmq-server/rabbitmq-server.hash
@@ -1,6 +1,5 @@
 # Locally computed
 sha256  395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e  rabbitmq-server-3.6.6.tar.xz
-sha256  f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba  LICENSE-MPL-RabbitMQ
 sha256  2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985  LICENSE
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
 sha256  809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE-APL2-Rebar
@@ -15,4 +14,5 @@ sha256  fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENS
 sha256  363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115  LICENSE-MIT-Mochiweb
 sha256  cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
 sha256  c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f  LICENSE-MIT-SockJS
+sha256  f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba  LICENSE-MPL-RabbitMQ
 sha256  fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85  LICENSE-MPL2
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index f9c28e6677..99b1ed4100 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -8,15 +8,24 @@ RABBITMQ_SERVER_VERSION = 3.6.6
 RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
 RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
 RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
-RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
-				LICENSE LICENSE-APACHE2-ExplorerCanvas \
-				LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
-				LICENSE-BSD-base64js LICENSE-BSD-glMatrix \
-				LICENSE-EPL-OTP LICENSE-MIT-EJS10 \
-				LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \
-				LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \
-				LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \
-				LICENSE-MPL2
+RABBITMQ_SERVER_LICENSE_FILES =
+	LICENSE \
+	LICENSE-APACHE2-ExplorerCanvas \
+	LICENSE-APL2-Rebar \
+	LICENSE-APL2-Stomp-Websocket \
+	LICENSE-BSD-base64js \
+	LICENSE-BSD-glMatrix \
+	LICENSE-EPL-OTP
+	LICENSE-MIT-EJS10 \
+	LICENSE-MIT-Flot \
+	LICENSE-MIT-jQuery164 \
+	LICENSE-MIT-Mochi \
+	LICENSE-MIT-Mochiweb \
+	LICENSE-MIT-Sammy060 \
+	LICENSE-MIT-SockJS \
+	LICENSE-MPL-RabbitMQ \
+	LICENSE-MPL2
+
 RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt
 RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults
 
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2
  2020-02-13 15:14     ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Frank Vanbever
@ 2020-02-13 15:14       ` Frank Vanbever
  2020-04-12 19:33         ` Thomas Petazzoni
  2020-04-12 19:33       ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Thomas Petazzoni
  1 sibling, 1 reply; 26+ messages in thread
From: Frank Vanbever @ 2020-02-13 15:14 UTC (permalink / raw)
  To: buildroot

RabbitMQ now depends on Elixir for the build system.
The log directory is required for the server to start with the default
configuration. This behaviour was changed in v3.7 with the move to erlang-lager
as the logging library.

License changes:
- LICENSE: Added clarification about the licensing of a number of included
  dependencies and a URL changed to HTTPS. License remains MPL-1.1
- LICENSE-BSD-base64js: URL changed to https (license text is actually MIT)
- LICENSE-MIT-Flot: year update
- LICENSE-MIT-JQuery164: URL changed to https
- LICENSE-MPL-RabbitMQ: URL changed to https, year update
- LICENSE-MPL2: URL changed to https

Removed licenses:
- LICENSE-APL2-Rebar: Removed dependency
- LICENSE-BSD-gl-Matrix: Removed dependency
- LICENSE-ERL-OTP: Removed license
- LICENSE-MIT-Mochiweb: Removed dependency
- LICENSE-MIT-SockJS: Removed dependency

New licenses:
- LICENSE-APACHE2-excanvas: new bundled dependency (Apache 2)
- LICENSE-BSD-recon: new bundled dependency (BSD 3-clause)
- LICENSE-erlcloud: new bundled dependency (BSD 2-clause)
- LICENSE-httpc_aws: new bundled dependency (BSD 3-clause)
- LICENSE-ISC-cowboy: new bundled dependency (ISC)
- LICENSE-MIT-EJS: new bundled dependency (MIT)
- LICENSE-MIT-Erlware-commons: license was present in 3.6.6 but not included in
  the list
- LICENSE-MIT-jQuery: new bundled dependency (MIT)
- LICENSE-MIT-Sammy: new bundled dependency (MIT)
- LICENSE-rabbitmq_aws: new bundled dependency (BSD 3-clause)

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
Changes v2 -> v3:
 - Cleaned up license files
Changes v1 -> v2:
 - Remove reference to BR2_PACKAGE_HOST_ELIXIR

Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
---
 package/rabbitmq-server/S50rabbitmq-server    |  2 ++
 package/rabbitmq-server/rabbitmq-server.hash  | 31 ++++++++++++-------
 package/rabbitmq-server/rabbitmq-server.mk    | 29 ++++++++++-------
 .../rabbitmq-server/rabbitmq-server.service   |  1 +
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server
index faf248ded2..35f7844860 100644
--- a/package/rabbitmq-server/S50rabbitmq-server
+++ b/package/rabbitmq-server/S50rabbitmq-server
@@ -5,10 +5,12 @@
 
 INSTALLUSER=rabbitmq
 RUNDIR=/var/run/rabbitmq
+LOGDIR=/var/log/rabbitmq
 
 case "$1" in
   start)
 	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1
+	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1
         printf "Starting rabbitmq-server: "
         su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null
         [ $? = 0 ] && echo "OK" || echo "FAIL"
diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash
index 5ad55b167b..693ab208ec 100644
--- a/package/rabbitmq-server/rabbitmq-server.hash
+++ b/package/rabbitmq-server/rabbitmq-server.hash
@@ -1,18 +1,25 @@
 # Locally computed
-sha256  395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e  rabbitmq-server-3.6.6.tar.xz
-sha256  2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985  LICENSE
+sha256  8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d  rabbitmq-server-3.8.2.tar.xz
+sha256  a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3  LICENSE
+sha256  acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a  LICENSE-APACHE2
+sha256  aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe  LICENSE-APACHE2-excanvas
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
-sha256  809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE-APL2-Rebar
 sha256  b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
-sha256  cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f  LICENSE-BSD-base64js
-sha256  2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1  LICENSE-BSD-glMatrix
-sha256  a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd  LICENSE-EPL-OTP
+sha256  3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9  LICENSE-BSD-base64js
+sha256  af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35  LICENSE-BSD-recon
+sha256  7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8  LICENSE-erlcloud
+sha256  c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-httpc_aws
+sha256  c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689  LICENSE-ISC-cowboy
+sha256  af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1  LICENSE-MIT-EJS
 sha256  b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
-sha256  e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c  LICENSE-MIT-Flot
-sha256  f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b  LICENSE-MIT-jQuery164
+sha256  0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4  LICENSE-MIT-Erlware-Commons
+sha256  52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c  LICENSE-MIT-Flot
+sha256  8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5  LICENSE-MIT-jQuery
+sha256  44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476  LICENSE-MIT-jQuery164
 sha256  fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
-sha256  363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115  LICENSE-MIT-Mochiweb
+sha256  b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c  LICENSE-MIT-Sammy
 sha256  cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
-sha256  c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f  LICENSE-MIT-SockJS
-sha256  f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba  LICENSE-MPL-RabbitMQ
-sha256  fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85  LICENSE-MPL2
+sha256  c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL
+sha256  c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL-RabbitMQ
+sha256  66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172  LICENSE-MPL2
+sha256  c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-rabbitmq_aws
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index 99b1ed4100..26c2fae5ec 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -4,29 +4,36 @@
 #
 ################################################################################
 
-RABBITMQ_SERVER_VERSION = 3.6.6
-RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
+RABBITMQ_SERVER_VERSION = 3.8.2
+RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION)
 RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
-RABBITMQ_SERVER_LICENSE_FILES =
+RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC
+RABBITMQ_SERVER_LICENSE_FILES = \
 	LICENSE \
+	LICENSE-APACHE2 \
+	LICENSE-APACHE2-excanvas \
 	LICENSE-APACHE2-ExplorerCanvas \
-	LICENSE-APL2-Rebar \
 	LICENSE-APL2-Stomp-Websocket \
 	LICENSE-BSD-base64js \
-	LICENSE-BSD-glMatrix \
-	LICENSE-EPL-OTP
+	LICENSE-BSD-recon \
+	LICENSE-erlcloud \
+	LICENSE-httpc_aws \
+	LICENSE-ISC-cowboy \
+	LICENSE-MIT-EJS \
 	LICENSE-MIT-EJS10 \
+	LICENSE-MIT-Erlware-Commons \
 	LICENSE-MIT-Flot \
+	LICENSE-MIT-jQuery \
 	LICENSE-MIT-jQuery164 \
 	LICENSE-MIT-Mochi \
-	LICENSE-MIT-Mochiweb \
+	LICENSE-MIT-Sammy \
 	LICENSE-MIT-Sammy060 \
-	LICENSE-MIT-SockJS \
+	LICENSE-MPL \
 	LICENSE-MPL-RabbitMQ \
-	LICENSE-MPL2
+	LICENSE-MPL2 \
+	LICENSE-rabbitmq_aws
 
-RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt
+RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt
 RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults
 
 define RABBITMQ_SERVER_BUILD_CMDS
diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service
index 268b4bdcd2..f69b33d455 100644
--- a/package/rabbitmq-server/rabbitmq-server.service
+++ b/package/rabbitmq-server/rabbitmq-server.service
@@ -8,6 +8,7 @@ User=rabbitmq
 Group=rabbitmq
 Environment=HOME=/var/lib/rabbitmq
 WorkingDirectory=/var/lib/rabbitmq
+LogsDirectory=/var/log/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl stop
 
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list
  2020-02-13 15:14     ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Frank Vanbever
  2020-02-13 15:14       ` [Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
@ 2020-04-12 19:33       ` Thomas Petazzoni
  1 sibling, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-04-12 19:33 UTC (permalink / raw)
  To: buildroot

Hello Frank,

Sorry for the long delay.

On Thu, 13 Feb 2020 16:14:13 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

> +RABBITMQ_SERVER_LICENSE_FILES =

There was a missing backslash at the end of this line. I fixed that up,
and applied.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2
  2020-02-13 15:14       ` [Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
@ 2020-04-12 19:33         ` Thomas Petazzoni
  0 siblings, 0 replies; 26+ messages in thread
From: Thomas Petazzoni @ 2020-04-12 19:33 UTC (permalink / raw)
  To: buildroot

On Thu, 13 Feb 2020 16:14:14 +0100
Frank Vanbever <frank.vanbever@essensium.com> wrote:

> RabbitMQ now depends on Elixir for the build system.
> The log directory is required for the server to start with the default
> configuration. This behaviour was changed in v3.7 with the move to erlang-lager
> as the logging library.
> 
> License changes:
> - LICENSE: Added clarification about the licensing of a number of included
>   dependencies and a URL changed to HTTPS. License remains MPL-1.1
> - LICENSE-BSD-base64js: URL changed to https (license text is actually MIT)
> - LICENSE-MIT-Flot: year update
> - LICENSE-MIT-JQuery164: URL changed to https
> - LICENSE-MPL-RabbitMQ: URL changed to https, year update
> - LICENSE-MPL2: URL changed to https
> 
> Removed licenses:
> - LICENSE-APL2-Rebar: Removed dependency
> - LICENSE-BSD-gl-Matrix: Removed dependency
> - LICENSE-ERL-OTP: Removed license
> - LICENSE-MIT-Mochiweb: Removed dependency
> - LICENSE-MIT-SockJS: Removed dependency
> 
> New licenses:
> - LICENSE-APACHE2-excanvas: new bundled dependency (Apache 2)
> - LICENSE-BSD-recon: new bundled dependency (BSD 3-clause)
> - LICENSE-erlcloud: new bundled dependency (BSD 2-clause)
> - LICENSE-httpc_aws: new bundled dependency (BSD 3-clause)
> - LICENSE-ISC-cowboy: new bundled dependency (ISC)
> - LICENSE-MIT-EJS: new bundled dependency (MIT)
> - LICENSE-MIT-Erlware-commons: license was present in 3.6.6 but not included in
>   the list
> - LICENSE-MIT-jQuery: new bundled dependency (MIT)
> - LICENSE-MIT-Sammy: new bundled dependency (MIT)
> - LICENSE-rabbitmq_aws: new bundled dependency (BSD 3-clause)
> 
> Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
> ---
> Changes v2 -> v3:
>  - Cleaned up license files
> Changes v1 -> v2:
>  - Remove reference to BR2_PACKAGE_HOST_ELIXIR

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 26+ messages in thread
end of thread, other threads:[~2020-04-12 19:33 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-29 17:26 [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Frank Vanbever
2020-01-29 17:26 ` [Buildroot] [PATCH 2/3] package/elixir: new package Frank Vanbever
2020-02-01 22:02   ` Thomas Petazzoni
2020-01-29 17:26 ` [Buildroot] [PATCH 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
2020-02-01 21:59   ` Thomas Petazzoni
2020-02-01 21:57 ` [Buildroot] [PATCH 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
2020-02-04 10:07 ` [Buildroot] [PATCH v2 " Frank Vanbever
2020-02-04 10:07   ` [Buildroot] [PATCH v2 2/3] package/elixir: new package Frank Vanbever
2020-02-05 14:42     ` Thomas Petazzoni
2020-02-04 10:07   ` [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
2020-02-05 14:47     ` Thomas Petazzoni
2020-02-13 15:14     ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Frank Vanbever
2020-02-13 15:14       ` [Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2 Frank Vanbever
2020-04-12 19:33         ` Thomas Petazzoni
2020-04-12 19:33       ` [Buildroot] [PATCH v3 1/2] package/rabbitmq-server: clean up license list Thomas Petazzoni
2020-02-05  9:37   ` [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2 Thomas Petazzoni
2020-02-05 11:15     ` Frank Vanbever
2020-02-05 14:42   ` Thomas Petazzoni
2020-02-10 13:28     ` Johan Oudinet
2020-02-10 13:30       ` Thomas Petazzoni
2020-02-10 15:20         ` Johan Oudinet
2020-02-10 15:27           ` Johan Oudinet
2020-02-10 15:51             ` Johan Oudinet
2020-02-10 15:57               ` Thomas Petazzoni
2020-02-10 16:07                 ` Johan Oudinet
2020-02-10 16:48                   ` Johan Oudinet

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.