* [Buildroot] [PATCH 1/1] ejabberd: Replace $(HOST_DIR) to /usr in ERL path
@ 2017-09-25 16:34 Johan Oudinet
2017-09-28 21:27 ` Peter Korsgaard
2017-10-17 9:00 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Johan Oudinet @ 2017-09-25 16:34 UTC (permalink / raw)
To: buildroot
Previously, it was working by luck. Buildroot has fixed its definition
of HOST_DIR and pkg-autotools.mk uses the classical /usr prefix. So,
fix this sed expression to correctly replace $(HOST_DIR) by /usr in ERL
path.
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
package/ejabberd/ejabberd.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
index 9baa1124a3..35a1027efb 100644
--- a/package/ejabberd/ejabberd.mk
+++ b/package/ejabberd/ejabberd.mk
@@ -36,9 +36,9 @@ define EJABBERD_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D)
endef
-# Delete HOST_DIR prefix from ERL path in ejabberctl script.
+# Replace HOST_DIR prefix to /usr in ERL path of ejabberctl script.
define EJABBERD_FIX_EJABBERDCTL
- $(SED) 's,ERL=$(HOST_DIR),ERL=,' '$(TARGET_DIR)/usr/sbin/ejabberdctl'
+ $(SED) 's,ERL=$(HOST_DIR),ERL=/usr,' '$(TARGET_DIR)/usr/sbin/ejabberdctl'
endef
EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_FIX_EJABBERDCTL
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] ejabberd: Replace $(HOST_DIR) to /usr in ERL path
2017-09-25 16:34 [Buildroot] [PATCH 1/1] ejabberd: Replace $(HOST_DIR) to /usr in ERL path Johan Oudinet
@ 2017-09-28 21:27 ` Peter Korsgaard
2017-10-17 9:00 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2017-09-28 21:27 UTC (permalink / raw)
To: buildroot
>>>>> "Johan" == Johan Oudinet <johan.oudinet@gmail.com> writes:
> Previously, it was working by luck. Buildroot has fixed its definition
> of HOST_DIR and pkg-autotools.mk uses the classical /usr prefix. So,
> fix this sed expression to correctly replace $(HOST_DIR) by /usr in ERL
> path.
> Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] ejabberd: Replace $(HOST_DIR) to /usr in ERL path
2017-09-25 16:34 [Buildroot] [PATCH 1/1] ejabberd: Replace $(HOST_DIR) to /usr in ERL path Johan Oudinet
2017-09-28 21:27 ` Peter Korsgaard
@ 2017-10-17 9:00 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2017-10-17 9:00 UTC (permalink / raw)
To: buildroot
>>>>> "Johan" == Johan Oudinet <johan.oudinet@gmail.com> writes:
> Previously, it was working by luck. Buildroot has fixed its definition
> of HOST_DIR and pkg-autotools.mk uses the classical /usr prefix. So,
> fix this sed expression to correctly replace $(HOST_DIR) by /usr in ERL
> path.
> Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
Committed to 2017.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-17 9:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-25 16:34 [Buildroot] [PATCH 1/1] ejabberd: Replace $(HOST_DIR) to /usr in ERL path Johan Oudinet
2017-09-28 21:27 ` Peter Korsgaard
2017-10-17 9:00 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox