From bc044424ff08a9b22d0422f518fd9e116354e866 Mon Sep 17 00:00:00 2001 From: Nathan Johnson Date: Thu, 30 Mar 2017 11:46:39 -0500 Subject: testing/rabbitmq-server: update to version 3.6.9 Delete grep.patch, merged upstream --- testing/rabbitmq-server/APKBUILD | 16 +- testing/rabbitmq-server/grep.patch | 299 ------------------------------------- 2 files changed, 6 insertions(+), 309 deletions(-) delete mode 100644 testing/rabbitmq-server/grep.patch (limited to 'testing/rabbitmq-server') diff --git a/testing/rabbitmq-server/APKBUILD b/testing/rabbitmq-server/APKBUILD index d809620bb4..592c3c4342 100644 --- a/testing/rabbitmq-server/APKBUILD +++ b/testing/rabbitmq-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Nathan Johnson # Maintainer: Nathan Johnson pkgname=rabbitmq-server -pkgver=3.6.5 +pkgver=3.6.9 _realver=${pkgver//\./_} pkgrel=0 pkgdesc="RabbitMQ is an open source multi-protocol messaging broker." @@ -24,7 +24,6 @@ source=" rabbitmq-server.initd rabbitmq-server.logrotate https://github.com/rabbitmq/${pkgname}/releases/download/rabbitmq_v${_realver}/${pkgname}-${pkgver}.tar.xz - grep.patch " builddir="$srcdir/${pkgname}-${pkgver}" @@ -70,8 +69,8 @@ package() { mkdir -p "$pkgdir"/usr/share/doc/"$pkgname" cp -a "$builddir"/LICENSE* "$pkgdir"/usr/share/doc/"$pkgname"/ - cp -a "$builddir"/docs/* "$pkgdir"/usr/share/doc/"$pkgname"/ - + cp -a "$builddir"/deps/rabbit/docs/* "$pkgdir"/usr/share/doc/"$pkgname"/ + cp -a "$builddir"/deps/rabbitmq_sharding/docs/* "$pkgdir"/usr/share/doc/"$pkgname"/ chmod 755 "$pkgdir"/var/lib/rabbitmq chmod 750 "$pkgdir"/var/lib/rabbitmq/mnesia chmod 755 "$pkgdir"/var/log/rabbitmq @@ -81,13 +80,10 @@ package() { md5sums="12287613dfb924d4cde19202de6eb313 rabbitmq-server.initd f24af11867cddc5a17fefa8bf4276d52 rabbitmq-server.logrotate -e9f96b5763a89a246f53250e46c2796b rabbitmq-server-3.6.5.tar.xz -5f37a357fbc66ab013f3aa889c2fcd80 grep.patch" +30dc144263dcce89e041913c24be61df rabbitmq-server-3.6.9.tar.xz" sha256sums="b1ffe4a47550474c7a5b8ab47f4cd40549b84ede361302fa58863f27f17be3ec rabbitmq-server.initd 9cce79e90835317b9704ecdf44e7dbc71803a17c85c1402f2bb4b2edb0232ab2 rabbitmq-server.logrotate -9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec rabbitmq-server-3.6.5.tar.xz -57d2bd63473d2cacf9f5a0b5d9523becaa9b30fc0d6419b7daa975e99ae53aa7 grep.patch" +2df4f09860167de803f592a45792f3f83533bd97acdd7e18569c5bafcf2e470f rabbitmq-server-3.6.9.tar.xz" sha512sums="a8bb02a7cae1f8720e5c7aaabfe6a2c0e731cffbe0d8f99bdcb6597daa654dc49e6d41943974601435700cf469eaa8286dc91a3255a6b9023754c3861fbb5cd9 rabbitmq-server.initd b8655cb048ab3b32001d4e6920bb5366696f3a5da75c053605e9b270e771c548e36858dca8338813d34376534515bba00af5e6dd7b4b1754a0e64a8fb756e3f3 rabbitmq-server.logrotate -50751a25b39a96a8b0665c9316d8a603050807597f932e0b3cc74f63fbd73a5668865ad7e7c58de5bef80295a5a3c472731446e4e07c530812a6275703ce2388 rabbitmq-server-3.6.5.tar.xz -18e30c7e5bfd0290321e98ae91023bf74393caccb410ab886a2a8154d15bf30ced68e393ae5318fdc045fdf444759bb775cd8be4ee7b5abb692e0e34e2c6d3c5 grep.patch" +a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 rabbitmq-server-3.6.9.tar.xz" diff --git a/testing/rabbitmq-server/grep.patch b/testing/rabbitmq-server/grep.patch deleted file mode 100644 index d754cd35a1..0000000000 --- a/testing/rabbitmq-server/grep.patch +++ /dev/null @@ -1,299 +0,0 @@ -diff --git a/erlang.mk b/erlang.mk -index efbcf5c..65fb954 100644 ---- a/erlang.mk -+++ b/erlang.mk -@@ -4991,7 +4991,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/amqp_client/erlang.mk b/deps/amqp_client/erlang.mk -index efbcf5c..65fb954 100644 ---- a/deps/amqp_client/erlang.mk -+++ b/deps/amqp_client/erlang.mk -@@ -4991,7 +4991,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbit_common/erlang.mk b/deps/rabbit_common/erlang.mk -index fc2d806..05952b2 100644 ---- a/deps/rabbit_common/erlang.mk -+++ b/deps/rabbit_common/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_auth_backend_ldap/erlang.mk b/deps/rabbitmq_auth_backend_ldap/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_auth_backend_ldap/erlang.mk -+++ b/deps/rabbitmq_auth_backend_ldap/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_auth_mechanism_ssl/erlang.mk b/deps/rabbitmq_auth_mechanism_ssl/erlang.mk -index 1688ee8..e5f225a 100644 ---- a/deps/rabbitmq_auth_mechanism_ssl/erlang.mk -+++ b/deps/rabbitmq_auth_mechanism_ssl/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_consistent_hash_exchange/erlang.mk b/deps/rabbitmq_consistent_hash_exchange/erlang.mk -index 1688ee8..e5f225a 100644 ---- a/deps/rabbitmq_consistent_hash_exchange/erlang.mk -+++ b/deps/rabbitmq_consistent_hash_exchange/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_event_exchange/erlang.mk b/deps/rabbitmq_event_exchange/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_event_exchange/erlang.mk -+++ b/deps/rabbitmq_event_exchange/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_federation_management/erlang.mk b/deps/rabbitmq_federation_management/erlang.mk -index 1688ee8..e5f225a 100644 ---- a/deps/rabbitmq_federation_management/erlang.mk -+++ b/deps/rabbitmq_federation_management/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_jms_topic_exchange/erlang.mk b/deps/rabbitmq_jms_topic_exchange/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_jms_topic_exchange/erlang.mk -+++ b/deps/rabbitmq_jms_topic_exchange/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_management/erlang.mk b/deps/rabbitmq_management/erlang.mk -index efbcf5c..65fb954 100644 ---- a/deps/rabbitmq_management/erlang.mk -+++ b/deps/rabbitmq_management/erlang.mk -@@ -4991,7 +4991,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_management_agent/erlang.mk b/deps/rabbitmq_management_agent/erlang.mk -index 1688ee8..e5f225a 100644 ---- a/deps/rabbitmq_management_agent/erlang.mk -+++ b/deps/rabbitmq_management_agent/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_management_visualiser/erlang.mk b/deps/rabbitmq_management_visualiser/erlang.mk -index 1688ee8..e5f225a 100644 ---- a/deps/rabbitmq_management_visualiser/erlang.mk -+++ b/deps/rabbitmq_management_visualiser/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_mqtt/erlang.mk b/deps/rabbitmq_mqtt/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_mqtt/erlang.mk -+++ b/deps/rabbitmq_mqtt/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_recent_history_exchange/erlang.mk b/deps/rabbitmq_recent_history_exchange/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_recent_history_exchange/erlang.mk -+++ b/deps/rabbitmq_recent_history_exchange/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_sharding/erlang.mk b/deps/rabbitmq_sharding/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_sharding/erlang.mk -+++ b/deps/rabbitmq_sharding/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_shovel/erlang.mk b/deps/rabbitmq_shovel/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_shovel/erlang.mk -+++ b/deps/rabbitmq_shovel/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_stomp/erlang.mk b/deps/rabbitmq_stomp/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_stomp/erlang.mk -+++ b/deps/rabbitmq_stomp/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_top/erlang.mk b/deps/rabbitmq_top/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_top/erlang.mk -+++ b/deps/rabbitmq_top/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_tracing/erlang.mk b/deps/rabbitmq_tracing/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_tracing/erlang.mk -+++ b/deps/rabbitmq_tracing/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_trust_store/erlang.mk b/deps/rabbitmq_trust_store/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_trust_store/erlang.mk -+++ b/deps/rabbitmq_trust_store/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_web_dispatch/erlang.mk b/deps/rabbitmq_web_dispatch/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_web_dispatch/erlang.mk -+++ b/deps/rabbitmq_web_dispatch/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_web_stomp/erlang.mk b/deps/rabbitmq_web_stomp/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_web_stomp/erlang.mk -+++ b/deps/rabbitmq_web_stomp/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_web_stomp_examples/erlang.mk b/deps/rabbitmq_web_stomp_examples/erlang.mk -index 1688ee8..e5f225a 100644 ---- a/deps/rabbitmq_web_stomp_examples/erlang.mk -+++ b/deps/rabbitmq_web_stomp_examples/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -- cgit v1.2.3