From 0b90a82cda00d4f5c449e5bb89621d48b1691e37 Mon Sep 17 00:00:00 2001 From: "eric.le.bihan.dev@free.fr" Date: Wed, 6 Nov 2013 16:34:34 +0100 Subject: [PATCH] system: move init system option above /dev management. The option to choose init system was below the one for /dev management. As Systemd forces the use of udev, it is logical to swap them. Signed-off-by: Eric Le Bihan Signed-off-by: Peter Korsgaard --- system/Config.in | 58 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/system/Config.in b/system/Config.in index 6418d5272d..266e709b4b 100644 --- a/system/Config.in +++ b/system/Config.in @@ -66,35 +66,6 @@ config BR2_TARGET_GENERIC_PASSWD_METHOD default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 -choice - prompt "/dev management" - default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS - -config BR2_ROOTFS_DEVICE_CREATION_STATIC - bool "Static using device table" - -config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS - bool "Dynamic using devtmpfs only" - -config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV - bool "Dynamic using mdev" - select BR2_PACKAGE_BUSYBOX - -config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV - bool "Dynamic using udev" - depends on BR2_LARGEFILE # udev - depends on BR2_USE_WCHAR # udev - depends on !BR2_PREFER_STATIC_LIB # udev -> kmod - select BR2_PACKAGE_UDEV - -comment "udev needs a toolchain w/ largefile, wchar" - depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) - -comment "udev doesn't work with 'prefer static libraries'" - depends on BR2_PREFER_STATIC_LIB - -endchoice - choice prompt "Init system" default BR2_INIT_BUSYBOX @@ -129,6 +100,35 @@ config BR2_INIT_NONE endchoice +choice + prompt "/dev management" + default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS + +config BR2_ROOTFS_DEVICE_CREATION_STATIC + bool "Static using device table" + +config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS + bool "Dynamic using devtmpfs only" + +config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV + bool "Dynamic using mdev" + select BR2_PACKAGE_BUSYBOX + +config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV + bool "Dynamic using udev" + depends on BR2_LARGEFILE # udev + depends on BR2_USE_WCHAR # udev + depends on !BR2_PREFER_STATIC_LIB # udev -> kmod + select BR2_PACKAGE_UDEV + +comment "udev needs a toolchain w/ largefile, wchar" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) + +comment "udev doesn't work with 'prefer static libraries'" + depends on BR2_PREFER_STATIC_LIB + +endchoice + config BR2_ROOTFS_DEVICE_TABLE string "Path to the permission tables" default "system/device_table.txt"