summaryrefslogtreecommitdiff
path: root/target/jffs2
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-04-10 17:48:53 +0000
committerEric Andersen <andersen@codepoet.org>2006-04-10 17:48:53 +0000
commit8cfa7aa9658e48d9113f7ed7da0c5994352fc8bf (patch)
treeb3ea36eb7b1240a4628b70ba2112cda9a88b7660 /target/jffs2
parent5418a92350168fbdc1f07839c783cb70952ecc06 (diff)
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/jffs2')
-rw-r--r--target/jffs2/jffs2root.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index d50bc88db..cdcbce8ea 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -45,25 +45,25 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
@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.$(JFFS2_TARGET)
+ rm -f $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET)
touch $(STAGING_DIR)/.fakeroot.00000
- cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET)
-$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_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.$(JFFS2_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) -- \
$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
# Use fakeroot so mkfs.jffs2 believes the previous fakery
$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+ -i $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) -- \
$(MKFS_JFFS2) $(JFFS2_OPTS) \
-d $(BUILD_DIR)/root -o $(JFFS2_TARGET)
- -@rm -f $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET)
@ls -l $(JFFS2_TARGET)
JFFS2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO)))