diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-18 22:31:43 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-18 22:31:43 +0200 |
| commit | 50f8d922941ac1c7f62162bf674ebf980452ed86 (patch) | |
| tree | 75d5e0f1fd84925d0a19a353892e36a3bd3a2106 /fs | |
| parent | 4ab6883ac5aa07ea1c317d85c92495b155cf214a (diff) | |
| parent | 525ac766cd795c4f7f721e7b940e3ebce99e8ebc (diff) | |
Merge branch 'fs-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Config.in | 8 | ||||
| -rw-r--r-- | fs/common.mk | 5 | ||||
| -rw-r--r-- | fs/cramfs/cramfs.mk | 4 | ||||
| -rw-r--r-- | fs/jffs2/jffs2.mk | 4 |
4 files changed, 15 insertions, 6 deletions
diff --git a/fs/Config.in b/fs/Config.in index f885c52e7..6865eeaff 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -15,6 +15,14 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT only argument. Make sure the exit code of that script is 0, otherwise make will stop after calling it. +config BR2_ROOTFS_DEVICE_TABLE + string "Path to the device table" + default "target/generic/device_table.txt" + help + Specify the location of a device table, that will be passed + to the makedevs utility to create all the special device + files in the target filesystem. + source "fs/cramfs/Config.in" source "fs/cloop/Config.in" source "fs/ext2/Config.in" diff --git a/fs/common.mk b/fs/common.mk index fa6afd94d..cc94eb4ef 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -28,6 +28,7 @@ # macro will automatically generate a compressed filesystem image. FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs +ROOTFS_DEVICE_TABLE = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) define ROOTFS_TARGET_INTERNAL @@ -38,8 +39,8 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot makedevs touch $(BUILD_DIR)/.fakeroot.00000 cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT) echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) -ifneq ($(TARGET_DEVICE_TABLE),) - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) +ifneq ($(ROOTFS_DEVICE_TABLE),) + echo "$(HOST_DIR)/usr/bin/makedevs -d $(ROOTFS_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) endif echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT) chmod a+x $(FAKEROOT_SCRIPT) diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk index ccd316f5d..e0deb7e2a 100644 --- a/fs/cramfs/cramfs.mk +++ b/fs/cramfs/cramfs.mk @@ -9,8 +9,8 @@ else CRAMFS_OPTS=-l endif -ifneq ($(TARGET_DEVICE_TABLE),) -CRAMFS_OPTS += -D $(TARGET_DEVICE_TABLE) +ifneq ($(ROOTFS_DEVICE_TABLE),) +CRAMFS_OPTS += -D $(ROOTFS_DEVICE_TABLE) endif define ROOTFS_CRAMFS_CMD diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk index a0a563d18..36be03741 100644 --- a/fs/jffs2/jffs2.mk +++ b/fs/jffs2/jffs2.mk @@ -32,8 +32,8 @@ JFFS2_OPTS += -n SUMTOOL_OPTS += -n endif -ifneq ($(TARGET_DEVICE_TABLE),) -JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE) +ifneq ($(ROOTFS_DEVICE_TABLE),) +JFFS2_OPTS += -D $(ROOTFS_DEVICE_TABLE) endif ROOTFS_JFFS2_DEPENDENCIES = host-mtd |