aboutsummaryrefslogtreecommitdiff
path: root/target/iso9660
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-04-10 22:49:48 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-04-10 22:49:48 +0000
commit674d61d84b2b754057be95038462b97ad83f759f (patch)
tree08f19974441080147b1a2406bbe62b5847035162 /target/iso9660
parentbfcb34c69f8a1e28bbd2daf3d5841350fa855f10 (diff)
downloadbuildroot-674d61d84b2b754057be95038462b97ad83f759f.tar.gz
buildroot-674d61d84b2b754057be95038462b97ad83f759f.tar.bz2
yet again... rework fakeroot handling to ensure fakeroot is invoked just once,
as it seems to sometimes lose values logged during from earlier invocations.
Diffstat (limited to 'target/iso9660')
-rw-r--r--target/iso9660/iso9660.mk18
1 files changed, 6 insertions, 12 deletions
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index 436214130e..1da79b8a7d 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -63,19 +63,13 @@ $(ISO9660_TARGET): host-fakeroot $(EXT2_TARGET) grub mkisofs
rm -f $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
touch $(STAGING_DIR)/.fakeroot.00000
cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
- -$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) -- \
- chown -R root:root $(ISO9660_TARGET_DIR)
+ echo "chown -R root:root $(ISO9660_TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
# Use fakeroot so mkisofs believes the previous fakery
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) -- \
- $(MKISOFS_TARGET) \
- -R -b boot/grub/stage2_eltorito -no-emul-boot \
- -boot-load-size 4 -boot-info-table \
- -o $(ISO9660_TARGET) \
- $(ISO9660_TARGET_DIR)
+ echo "$(MKISOFS_TARGET) -R -b boot/grub/stage2_eltorito -no-emul-boot " \
+ "-boot-load-size 4 -boot-info-table -o $(ISO9660_TARGET) $(ISO9660_TARGET_DIR)" \
+ >> $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
+ chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
+ $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
-@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
iso9660root: $(ISO9660_TARGET)