From 674d61d84b2b754057be95038462b97ad83f759f Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 10 Apr 2006 22:49:48 +0000
Subject: yet again... rework fakeroot handling to ensure fakeroot is invoked
 just once, as it seems to sometimes lose values logged during from earlier
 invocations.

---
 target/tar/tarroot.mk | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'target/tar')

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 6215134d9..5002db57a 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -16,20 +16,15 @@ tarroot: host-fakeroot makedevs
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
-	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \
-		chown -R root:root $(TARGET_DIR)
+	echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 	# Use fakeroot to pretend to create all needed device nodes
-	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \
-		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
+	echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
+		>> $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 	# Use fakeroot so tar believes the previous fakery
-	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \
-	    tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) .
+	echo "tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) ." \
+		>> $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
+	chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
+	$(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 	-@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 
 tarroot-source:
-- 
cgit v1.2.3