[openwrt/openwrt] tools/e2fsprogs: fixup STAGING_DIR_HOST path evaluation in shell scripts

LEDE Commits lede-commits at lists.infradead.org
Tue Jul 2 05:04:53 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/fd085a737b9c2158e4086954f316494eebcb4ae1

commit fd085a737b9c2158e4086954f316494eebcb4ae1
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Tue Jul 2 11:14:17 2024 +0200

    tools/e2fsprogs: fixup STAGING_DIR_HOST path evaluation in shell scripts
    
    We have to use curly braces on the exported STAGING_DIR_HOST env variable,
    instead of evaluating it directly as we are not in Make but a separate
    shell script.
    
    Otherwise it would fail with:
    staging_dir/host/bin/compile_et: line 6: STAGING_DIR_HOST: command not found
    staging_dir/host/bin/mk_cmds: line 5: STAGING_DIR_HOST: command not found
    
    And so when krb5 tries to build it will fail as compile_et and mk_cmds will
    return an error.
    
    Fixes: 55bda9863dd0 ("tools/e2fsprogs: fix shell scripts under SDK")
    Link: https://github.com/openwrt/openwrt/pull/15854
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 tools/e2fsprogs/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index cb59f4d9ec..2c35adfa8f 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -39,8 +39,8 @@ endef
 
 define Host/Install
 	$(call Host/Install/Default)
-	$(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/et|' $(STAGING_DIR_HOST)/bin/compile_et
-	$(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds
+	$(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/et|' $(STAGING_DIR_HOST)/bin/compile_et
+	$(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds
 endef
 
 define Host/Uninstall




More information about the lede-commits mailing list