[openwrt/openwrt] build: unbreak fakeroot in SDK

LEDE Commits lede-commits at lists.infradead.org
Mon Aug 31 23:10:57 EDT 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/729a75c3b2db0aa25745e8db425711cc761fa1f6

commit 729a75c3b2db0aa25745e8db425711cc761fa1f6
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Tue Sep 1 04:08:47 2020 +0100

    build: unbreak fakeroot in SDK
    
    Using fakeroot without passing the paths to libfakeroot.sh and faked
    causes havoc. Use the $(FAKEROOT) Make variable which includes them.
    
    Fixes: 353ce2e521 ("build: ipkg-build use fakeroot with PKG_FILE_MODES")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 include/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index 3a12db3676..703aeb6816 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -250,7 +250,7 @@ define Image/mkfs/squashfs
 	     "$(call mkfs_target_dir,$(1))" > $@.fakeroot-script
 	echo "$(Image/mkfs/squashfs-common)" >> $@.fakeroot-script
 	chmod +x $@.fakeroot-script
-	$(STAGING_DIR_HOST)/bin/fakeroot $@.fakeroot-script
+	$(FAKEROOT) "$@.fakeroot-script"
 endef
 else
 define Image/mkfs/squashfs



More information about the lede-commits mailing list