From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 1 Sep 2020 03:08:47 +0000 (+0100)
Subject: build: unbreak fakeroot in SDK
X-Git-Tag: v21.02.0-rc1~1696
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=729a75c3b2db0aa25745e8db425711cc761fa1f6;p=openwrt%2Fopenwrt.git

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@makrotopia.org>
---

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