aboutsummaryrefslogtreecommitdiff
path: root/target/cramfs/cramfs.mk
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/cramfs/cramfs.mk
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/cramfs/cramfs.mk')
-rw-r--r--target/cramfs/cramfs.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index b0ab28f234..bc73b9371b 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -67,25 +67,25 @@ cramfsroot: host-fakeroot makedevs cramfs
@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.$(CRAMFS_TARGET)
+ rm -f $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
touch $(STAGING_DIR)/.fakeroot.00000
- cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
-$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_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.$(CRAMFS_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
# Use fakeroot so mkcramfs believes the previous fakery
$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) \
$(TARGET_DIR) $(CRAMFS_TARGET)
- -@rm -f $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
cramfsroot-source: cramfs-source