From 674d61d84b2b754057be95038462b97ad83f759f Mon Sep 17 00:00:00 2001 From: Eric Andersen 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/iso9660/iso9660.mk | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'target/iso9660/iso9660.mk') diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 436214130..1da79b8a7 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) -- cgit v1.2.3