aboutsummaryrefslogtreecommitdiff
path: root/target/jffs2
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-02-15 16:49:39 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-02-15 16:49:39 +0000
commit0091f181efdb042e778a357df0ba8ffaddfc9b0c (patch)
tree12579ad566f77af82be219c517dc9b23738058f0 /target/jffs2
parent2f67d9e2fe7bbec10e67bf7e52999c594c4d6400 (diff)
downloadbuildroot-0091f181efdb042e778a357df0ba8ffaddfc9b0c.tar.gz
buildroot-0091f181efdb042e778a357df0ba8ffaddfc9b0c.tar.bz2
- do not use TARGET_DEVICE_TABLE if is is empty
Diffstat (limited to 'target/jffs2')
-rw-r--r--target/jffs2/jffs2root.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index db0489d9a4..c00cace27e 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -37,7 +37,7 @@ JFFS2_TARGET := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT)))
#"))
JFFS2_DEVFILE = $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_DEVFILE)))
#"))
-ifneq ($(JFFS2_DEVFILE),)
+ifneq ($(JFFS2_DEVFILE)$(TARGET_DEVICE_TABLE),)
JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE)
endif
@@ -59,9 +59,11 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
touch $(STAGING_DIR)/.fakeroot.00000
cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+ifneq ($(TARGET_DEVICE_TABLE),)
# Use fakeroot to pretend to create all needed device nodes
echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
>> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+endif
# Use fakeroot so mkfs.jffs2 believes the previous fakery
echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(BUILD_DIR)/root -o $(JFFS2_TARGET)" \
>> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))