From patchwork Tue Feb 4 10:07:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Vanbever X-Patchwork-Id: 1233232 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=i45kWBw4; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48BgPN5GHNzB3wK for ; Tue, 4 Feb 2020 21:08:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 986162052E; Tue, 4 Feb 2020 10:08:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J8j3qCdKI6Ko; Tue, 4 Feb 2020 10:08:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 86CEC20522; Tue, 4 Feb 2020 10:08:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 95AC41BF841 for ; Tue, 4 Feb 2020 10:07:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 91EBC8160B for ; Tue, 4 Feb 2020 10:07:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qQJSS5mfB+VI for ; Tue, 4 Feb 2020 10:07:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id CB84A815EE for ; Tue, 4 Feb 2020 10:07:57 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z9so9963229wrs.10 for ; Tue, 04 Feb 2020 02:07:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XNRI6zlBe17Y5G/Lyc1+YaOzyH1Boc3TJgM2h5FTYEE=; b=i45kWBw4AlLAlORWoCeWLLwf2RYqEnBbVOZSzyG2CVkdWsjOsstzxWicHnUhkbnfWB fmKVq32ryApsePhhRBfo0CdTh9AxlhxMNk6xSRO7SlF99PLoKU3788iKbLOObKH6k4zn JM9+/y+ghdpzEUazCcVCQElCSzlu+kF7h1Zh7C9fVFS0Zi9OW7eoLXhYBm8lePWUXvV2 Uhu/Rrp5heWXMkYgarfrI5KqdscgxuWFskZYRuALHrR8q63c+AMozf7KDcxmaj09dAe1 8gghOlxtN9LtAx048O7CL9NX2vvU7b23iL24sYmGrd84LqyE/DvnryKYVGcwDwPUCtzJ 3JzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XNRI6zlBe17Y5G/Lyc1+YaOzyH1Boc3TJgM2h5FTYEE=; b=UQSDS2xkVSCQuEqW4CWD/p9/Dk8uXvJhp95DKkiLrZdA8b4VXFWBX/rBOJE+cgdqzH Up4LLqHURoAXo/ijEi2OTAXihPR6cv1Z9ktkPXsP7cR+lmd10vLVa9HjWTCk7jZsKabT JYqsf66x6AAg6LJd9sJmuurqlOVs0/Wl1L7PPA7SZtiYOFS5O/PZS/KCjnxWhCSPSSez QJ0c7cZNiYDb9iyXNC2aAUzuyOPtbnlkLdxm65wFTLpgpK6gqJfP6N1uibFmYeH7iUPW JUZUC1TnPWw8rDF6tCsTuoRCGTXPZqGa1MEcdoYjJWlUaOsNj5ctU8l7dAgMqXoMf2b/ cHPw== X-Gm-Message-State: APjAAAVbWhRbZRw2T9K1CkCu0FNEdEQBTanNcFX7HC7awJBOaOeFK+DD VocKmk5DJ9ZklNH1xeCz2w04nFsqL/SM4g== X-Google-Smtp-Source: APXvYqyh0VFDsuPx7M4qXc1MaBCkhBdcfqQGKTF+Eb51H9fF3EIGR3Aw7SjT0H3DMkMRgutTf9iCMg== X-Received: by 2002:a5d:53c1:: with SMTP id a1mr20734694wrw.373.1580810875960; Tue, 04 Feb 2020 02:07:55 -0800 (PST) Received: from wintermute.lan ([2a02:a03f:5073:bb00:d06f:8d0c:50d6:c2de]) by smtp.gmail.com with ESMTPSA id y1sm16893648wrq.16.2020.02.04.02.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 02:07:55 -0800 (PST) From: Frank Vanbever To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 11:07:31 +0100 Message-Id: <20200204100733.22106-1-frank.vanbever@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200129172618.16966-1-frank.vanbever@essensium.com> References: <20200129172618.16966-1-frank.vanbever@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/3] package/erlang: bump to version 22.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Vanbever , Thomas Petazzoni , Will Newton , Johan Oudinet Errors-To: buildroot-bounces@busybox.net Sender: "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 --- 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 --- ...-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 -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 ---- - 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. From patchwork Tue Feb 4 10:07:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Vanbever X-Patchwork-Id: 1233233 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=ZrzV3Pvp; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48BgPV4JmbzB3wK for ; Tue, 4 Feb 2020 21:08:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5FDDC85010; Tue, 4 Feb 2020 10:08:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f2hrE_kKJvxw; Tue, 4 Feb 2020 10:08:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B98B084480; Tue, 4 Feb 2020 10:08:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BE0C81BF841 for ; Tue, 4 Feb 2020 10:08:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BAFC184480 for ; Tue, 4 Feb 2020 10:08:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hYHV1dWVSOUR for ; Tue, 4 Feb 2020 10:08:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 730B880ED5 for ; Tue, 4 Feb 2020 10:08:08 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id y11so22178054wrt.6 for ; Tue, 04 Feb 2020 02:08:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8t+z5fqXeXspLem34P+gNzzewwXv+W2MVIfBKSe2OSE=; b=ZrzV3PvpW0Md+9OQPrs4QlK66Lzz5oCJAPTjMs20SLy8Z6l+J8Zei6+71vrvGkkUWl 8ZGyAeYxihvpUTPl+WfUKRjbb0T+wj2/Qy4cedG6VMgFvhPMIoCHkKAOgmj5RVPiUcpq hlw2S8Eg45ZO8BXcr3M90ny/lf93UGbg8/EJzAIIXWMX5tvto08xr7zlcIDY6IOA0P0v IgmU6oVXlo6JA6fHbbEU4j2RFHSOA9RFCmVOI7uhUhj38rnEAIy1dZkZYFC3PQYlp8Yc JJNiaSUuf8joe7RZPEtnqgdxb+D+S0iZzMeEOEwGa+4wKJojJnLnJA6ADy2P+h4LM8ZM FqNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8t+z5fqXeXspLem34P+gNzzewwXv+W2MVIfBKSe2OSE=; b=QpF+hPbY2GNrRxcJJEps5wkg/DCNwX5fDrhgiJOKf/egXXq1+HZHkVyrHD2/VuctKR lKN2ODfxt5cfGi4wtTtesApyBoCDRvDuGk7/UTKzJuo1N7ncSk6Q3rpx7Gej23FuuKhn PBkNbiQ2QAJxE/bHm4c65LnQXFElf4++FBYOdV+TWuiHIgKjCRhjMqszOokl0w2ZuUwd BPq9NfoJzE3Mylc53h6nHVwPzTU6JwMAQJCmiBFEmUJBRPzP1XuvHecDHRFQJ6jaCNHN UcN7YpgW2rP1n0yXePqqB4bISfDB899wwT7PKWvM7aUP/mvB28VFaGYhocZplGDDIJ+J vWbA== X-Gm-Message-State: APjAAAVXjTcvKwn9mz+g8cRZ+U6Buse/EURMProTxFTLLcz2I8G39/FJ i9BKbysqkHpx2hS2a5hcJUg1eFHeOdAudg== X-Google-Smtp-Source: APXvYqySpWV6q02/yE21tnPkXma+WPqCr3bGVJqUaQVzSZuuZFVKXF8DY9YVmv3w5sHhYlvoRRILwg== X-Received: by 2002:a5d:530e:: with SMTP id e14mr20951730wrv.250.1580810886501; Tue, 04 Feb 2020 02:08:06 -0800 (PST) Received: from wintermute.lan ([2a02:a03f:5073:bb00:d06f:8d0c:50d6:c2de]) by smtp.gmail.com with ESMTPSA id y1sm16893648wrq.16.2020.02.04.02.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 02:08:05 -0800 (PST) From: Frank Vanbever To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 11:07:32 +0100 Message-Id: <20200204100733.22106-2-frank.vanbever@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200204100733.22106-1-frank.vanbever@essensium.com> References: <20200129172618.16966-1-frank.vanbever@essensium.com> <20200204100733.22106-1-frank.vanbever@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/3] package/elixir: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Vanbever , Thomas Petazzoni , Will Newton , Johan Oudinet Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" elixir is required to build RabbitMQ starting from v3.7 Signed-off-by: Frank Vanbever --- 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 +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)) From patchwork Tue Feb 4 10:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Vanbever X-Patchwork-Id: 1233234 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=SguNtF01; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48BgPh31RhzB3wK for ; Tue, 4 Feb 2020 21:08:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AFEA72052B; Tue, 4 Feb 2020 10:08:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eRTgwkQkyNiK; Tue, 4 Feb 2020 10:08:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DEE7620523; Tue, 4 Feb 2020 10:08:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C46861BF841 for ; Tue, 4 Feb 2020 10:08:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C10EB8410C for ; Tue, 4 Feb 2020 10:08:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U7idCZb-O-nV for ; Tue, 4 Feb 2020 10:08:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4A8A0815EE for ; Tue, 4 Feb 2020 10:08:18 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id c9so22189199wrw.8 for ; Tue, 04 Feb 2020 02:08:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Zz0oYcZKo/26/SOapBxNfWUa4MMhXpml2iO0amrfMM=; b=SguNtF01FqSNmrfUPIdnNEy+KZ8+x/ThKNTGgL3qxlBKFvXTCiSQxVjbkErZ/kNiI9 eu7QauvggwdXBWkiElvYjQG0pWZ2zaGDZ1Ty6+dAzvAmE73Hco6/k1pRbN5qBehaKtg+ gwcSM33d+QurhB/Zdv7+AN32JQu/HxMXhiVcMaMUKjyONbYjfrP1QfPyib8fAzAlYNjT NhP9tnYFazi/qDMg1WT3xczgyyRnFpAQqEbr7DbzU5M9Y/KEbfP7vZy7uMrlou0HY4X1 6eyWZ5DCcBP95LyFpqOX8XOwagPaw+QyputbH2XsPArmjt+MxK4Z3dot3OUf7o9Y7hq3 xSyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Zz0oYcZKo/26/SOapBxNfWUa4MMhXpml2iO0amrfMM=; b=Z8gijabuNcOw0sm2+Vpv5vYrOJKfU6MTHHcv7gq8sPRylilfKqyWn3undbKzemaOBk hitNGtXXmH7CykuiS3UYL62R/dRbKORXN7ASR/NHf1IsIKiww3Hu2vLHPxOfjd1CzIkQ +WYYyPefZ4UhJPNBGFhpFI1kvTiZiJsLhz34vp9myWP/ZisF3UJNhUh3oRqmmluhKrcH 4vG92wGD2rFoazFTFbAkBfqcYCVwUZ9vbel+jR1cNyaoFu/dogw3WlZSB+4u6RfREuvK 2JUghWY/xLYcMyS/UwXnUqdPNaGQm1nXuvKiHYFzRrJHrm9BIH3i/RxABL/qO2cU93NU phRA== X-Gm-Message-State: APjAAAW7uJ8sZABa5WgYb45bk8mZIIIlP8eJj3/9LHp5aLmQCTXZtnjm LEh9qkPI/6ojogq7Mf9NSk5xUqathQbD2g== X-Google-Smtp-Source: APXvYqxT7an5GSPcvZYuvS994cOKWagY8N4Ftdk0orjnyC1lWXw53LGqijEkOEBe1AmJ25PRo1v0pw== X-Received: by 2002:a5d:4447:: with SMTP id x7mr21131014wrr.393.1580810896489; Tue, 04 Feb 2020 02:08:16 -0800 (PST) Received: from wintermute.lan ([2a02:a03f:5073:bb00:d06f:8d0c:50d6:c2de]) by smtp.gmail.com with ESMTPSA id y1sm16893648wrq.16.2020.02.04.02.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 02:08:15 -0800 (PST) From: Frank Vanbever To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 11:07:33 +0100 Message-Id: <20200204100733.22106-3-frank.vanbever@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200204100733.22106-1-frank.vanbever@essensium.com> References: <20200129172618.16966-1-frank.vanbever@essensium.com> <20200204100733.22106-1-frank.vanbever@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/3] package/rabbitmq-server: bump version to 3.8.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Vanbever , Thomas Petazzoni , Will Newton , Johan Oudinet Errors-To: buildroot-bounces@busybox.net Sender: "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 --- 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