summaryrefslogtreecommitdiffstats
path: root/target/iso9660
diff options
context:
space:
mode:
Diffstat (limited to 'target/iso9660')
-rw-r--r--target/iso9660/iso9660.mk20
1 files changed, 14 insertions, 6 deletions
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index a0b074000..1bc415aed 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -52,22 +52,30 @@ ifeq ($(strip $(BR2_TARGET_ROOTFS_ISO9660_SQUASH)),y)
ISO9660_OPTS+=-U
endif
-$(ISO9660_TARGET): host-fakeroot $(STAGING_DIR)/fakeroot.env $(EXT2_TARGET) grub mkisofs
+$(ISO9660_TARGET): host-fakeroot $(EXT2_TARGET) grub mkisofs
mkdir -p $(ISO9660_TARGET_DIR)
mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel
cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd
+ # Use fakeroot to pretend all target binaries are owned by root
+ rm -f $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
-$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
+ -i $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) -- \
chown -R root:root $(ISO9660_TARGET_DIR)
- -$(MKISOFS_TARGET) \
- -R \
- -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \
+ # Use fakeroot so mkisofs believes the previous fakery
+ $(STAGING_DIR)/usr/bin/fakeroot \
+ -i $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(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)
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
iso9660root: $(ISO9660_TARGET)
echo $(ISO9660_TARGET)