aboutsummaryrefslogtreecommitdiff
path: root/target/iso9660
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-04-10 17:48:53 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-04-10 17:48:53 +0000
commit8cfa7aa9658e48d9113f7ed7da0c5994352fc8bf (patch)
treeb3ea36eb7b1240a4628b70ba2112cda9a88b7660 /target/iso9660
parent5418a92350168fbdc1f07839c783cb70952ecc06 (diff)
downloadbuildroot-8cfa7aa9658e48d9113f7ed7da0c5994352fc8bf.tar.gz
buildroot-8cfa7aa9658e48d9113f7ed7da0c5994352fc8bf.tar.bz2
As noted by jacmet in bug 824:
svn 14777 seems to have broken cramfs/squashfs/tarroot. The problem is that $(IMAGE) is the absolute path of the image including directories, so the build tries to access $(STAGING_DIR)/_fakeroot.</full/path/to/buildroot/directory> which doesn't exist. The fix is to define CRAMFS/SQUASHFS/TAR_TARGET as $(notdir $(IMAGE).<extension>) instead.
Diffstat (limited to 'target/iso9660')
-rw-r--r--target/iso9660/iso9660.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index df8950413b..436214130e 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -60,23 +60,23 @@ $(ISO9660_TARGET): host-fakeroot $(EXT2_TARGET) grub mkisofs
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)
+ rm -f $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
touch $(STAGING_DIR)/.fakeroot.00000
- cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
-$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) -- \
chown -R root:root $(ISO9660_TARGET_DIR)
# 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) -- \
+ -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)
- -@rm -f $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
iso9660root: $(ISO9660_TARGET)
echo $(ISO9660_TARGET)