Browse Source

System config: split static-dev device table setting into seperate option

As discussed here:

http://lists.busybox.net/pipermail/buildroot/2011-May/043251.html

Add BR2_ROOTFS_STATIC_DEVICE_TABLE for the extra device table file(s)
to create device nodes in /dev, rather than complicated logic in
BR2_ROOTFS_DEVICE_TABLE, making it complicated to move between static
and dynamic modes.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 14 years ago
parent
commit
9dc7b73f3b
2 changed files with 17 additions and 9 deletions
  1. 2 1
      fs/common.mk
  2. 15 8
      target/generic/Config.in

+ 2 - 1
fs/common.mk

@@ -33,7 +33,8 @@
 
 FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
 FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
-ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
+ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) \
+	$(call qstrip,$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
 
 define ROOTFS_TARGET_INTERNAL
 

+ 15 - 8
target/generic/Config.in

@@ -33,18 +33,25 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 endchoice
 
 config BR2_ROOTFS_DEVICE_TABLE
+	string "Path to the permission tables"
+	default "target/generic/device_table.txt"
+	help
+	  Specify a space-separated list of permission table locations,
+	  that will be passed to the makedevs utility to assign
+	  correct owners and permissions on various files in the
+	  target filesystem.
+
+	  See package/makedevs/README for details on the usage and
+	  syntax of these files.
+
+config BR2_ROOTFS_STATIC_DEVICE_TABLE
 	string "Path to the device tables"
-	default "target/generic/device_table.txt target/generic/device_table_dev.txt" \
-		if BR2_ROOTFS_DEVICE_CREATION_STATIC
-	default "target/generic/device_table.txt" \
-		if (BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV || \
-		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
-		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS)
+	default "target/generic/device_table_dev.txt"
+	depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
 	help
 	  Specify a space-separated list of device table locations,
 	  that will be passed to the makedevs utility to create all
-	  the special device files and assign correct owners and
-	  permissions on various files in the target filesystem.
+	  the special device files under /dev.
 
 	  See package/makedevs/README for details on the usage and
 	  syntax of these files.