[openwrt/openwrt] rootfs: fix USE_APK detection

LEDE Commits lede-commits at lists.infradead.org
Sat May 18 13:15:43 PDT 2024


aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/52a225cba41f72f0e38958a77bcbc5353ccaa731

commit 52a225cba41f72f0e38958a77bcbc5353ccaa731
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sat May 18 23:10:49 2024 +0300

    rootfs: fix USE_APK detection
    
    Due to missing quotes the script would wrongly assume APK to be enabled
    and don't run post install scripts, breaking pretty much everything.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 include/rootfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/rootfs.mk b/include/rootfs.mk
index eb4fa434a3..907a95a794 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -78,7 +78,7 @@ define prepare_rootfs
 	@mkdir -p $(1)/var/lock
 	@( \
 		cd $(1); \
-		if [ -n $(CONFIG_USE_APK) ]; then \
+		if [ -n "$(CONFIG_USE_APK)" ]; then \
 		$(STAGING_DIR_HOST)/bin/tar -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install" -O > script.sh; \
 		chmod +x script.sh; \
 		IPKG_INSTROOT=$(1) $$(command -v bash) script.sh; \




More information about the lede-commits mailing list