Skip to contentSkip to conversation

ejabberd: Replace $(HOST_DIR) to /usr in ERL path

PATCH New Johan Oudinet 2 participants 3 messages Sep 25, 2017 – Oct 17, 2017

lore
Share & tools
lore

Johan Oudinet

author
#0 lore raw

PATCH 1/1 ejabberd: Replace $(HOST_DIR) to /usr in ERL path

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 <[email protected]>
---
 package/ejabberd/ejabberd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ejabberd/ejabberd.mk +2 -2
index 9baa1124a3..35a1027efb 100644
@@ -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
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 ejabberd: Replace $(HOST_DIR) to /usr in ERL path

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Johan" == Johan Oudinet <[email protected]> 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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 ejabberd: Replace $(HOST_DIR) to /usr in ERL path

In reply to Johan Oudinet
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Johan" == Johan Oudinet <[email protected]> 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 <[email protected]>

Committed to 2017.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard