summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Oudinet <johan.oudinet@gmail.com>2018-12-05 17:06:16 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-09 17:24:14 +0100
commitab60ea293916dc61e6e2e4ffaa4ff0555386e02c (patch)
tree465f9642a0a5d17fd6acd559e6562730774b30da
parentbb7c13273fbe2da0969e14ddfd61a46b78d79db2 (diff)
downloadbuildroot-ab60ea293916dc61e6e2e4ffaa4ff0555386e02c.tar.gz
buildroot-ab60ea293916dc61e6e2e4ffaa4ff0555386e02c.zip
package/pkg-rebar.mk: fix remove-rebar-config-dependencies
Handle the case where there is only one dependency described in rebar.config, so when the line starts by '{deps' and ends by '}.'. Before it was deleting this line but also all next lines until finding a line that ends by '}.'. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/pkg-rebar.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk
index b6b095929c..838e7681de 100644
--- a/package/pkg-rebar.mk
+++ b/package/pkg-rebar.mk
@@ -96,7 +96,8 @@ endef
# Remove the "deps" statement from a rebar.config file
define remove-rebar-config-dependencies
- $(SED) '/^{deps/,/}\.$$/d' $($(PKG)_DIR)/rebar.config
+ $(SED) '/^{deps.*}\.$$/d' -e '/^{deps/,/}\.$$/d' \
+ $($(PKG)_DIR)/rebar.config
endef
OpenPOWER on IntegriCloud