From 8cfa7aa9658e48d9113f7ed7da0c5994352fc8bf Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 10 Apr 2006 17:48:53 +0000 Subject: 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. which doesn't exist. The fix is to define CRAMFS/SQUASHFS/TAR_TARGET as $(notdir $(IMAGE).) instead. --- target/squashfs/squashfsroot.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/squashfs/squashfsroot.mk') diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index f41c9660b..baed90289 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -61,27 +61,27 @@ squashfsroot: host-fakeroot makedevs squashfs @rm -rf $(TARGET_DIR)/usr/info -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null # Use fakeroot to pretend all target binaries are owned by root - rm -f $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) + rm -f $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) touch $(STAGING_DIR)/.fakeroot.00000 - cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) + cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -$(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \ + -i $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) \ + -s $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -- \ chown -R root:root $(TARGET_DIR) # Use fakeroot to pretend to create all needed device nodes $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \ + -i $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) \ + -s $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -- \ $(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR) # Use fakeroot so mksquashfs believes the previous fakery $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \ + -i $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) \ + -s $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -- \ $(SQUASHFS_DIR)/squashfs-tools/mksquashfs \ $(TARGET_DIR) \ $(SQUASHFS_TARGET) \ -noappend $(SQUASHFS_ENDIANNESS) - -@rm -f $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) + -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) squashfsroot-source: squashfs-source -- cgit v1.2.3