diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile | 2 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 13 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 9 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 21 | ||||
| -rw-r--r-- | target/linux/kernel.config | 1 |
5 files changed, 45 insertions, 1 deletions
diff --git a/target/Makefile b/target/Makefile index 5af02d0f1..cf95ce4dd 100644 --- a/target/Makefile +++ b/target/Makefile @@ -67,6 +67,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K_Q800)$(ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208), @$(SED) 's#^\(CONFIG_.*BOOTPARAM_STRING="\)\(.*\)"#\1\2 ro $(FS_CMDLINE)"#' \ $(BUILD_DIR)/.kernelconfig.board endif +ifneq ($(ADK_RUNTIME_INIT_SYSTEMD),y) ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),) @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \ $(BUILD_DIR)/.kernelconfig.board @@ -74,6 +75,7 @@ else @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 rw"#' \ $(BUILD_DIR)/.kernelconfig.board endif +endif @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 $(FS_CMDLINE)"#' \ $(BUILD_DIR)/.kernelconfig.board ifneq ($(ADK_TARGET_CMDLINE),) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 14fc50633..7379f153e 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -33,6 +33,8 @@ config ADK_RUNTIME_INIT_S6 config ADK_RUNTIME_INIT_SYSTEMD bool "Use systemd init and supervision" select ADK_PACKAGE_SYSTEMD + select ADK_PACKAGE_DBUS + select ADK_PACKAGE_DBUS_WITH_SYSTEMD depends on ADK_TARGET_LIB_GLIBC config ADK_RUNTIME_INIT_SIMPLEINIT @@ -52,17 +54,26 @@ config ADK_RUNTIME_DEV_MDEV select ADK_KERNEL_DEVTMPFS select ADK_KERNEL_DEVTMPFS_MOUNT depends on ADK_PACKAGE_BUSYBOX + depends on !ADK_RUNTIME_INIT_SYSTEMD config ADK_RUNTIME_DEV_UDEV bool "Use udev" - select ADK_PACKAGE_UDEV if !ADK_PACKAGE_SYSTEMD + select ADK_PACKAGE_UDEV # needs depmod for module dependency generation on host select ADK_HOST_BUILD_KMOD select ADK_KERNEL_DEVTMPFS select ADK_KERNEL_DEVTMPFS_MOUNT + depends on !ADK_RUNTIME_INIT_SYSTEMD + +config ADK_RUNTIME_DEV_SYSTEMD_UDEV + bool "Use systemd udev" + select ADK_KERNEL_DEVTMPFS + select ADK_KERNEL_DEVTMPFS_MOUNT + depends on ADK_RUNTIME_INIT_SYSTEMD config ADK_RUNTIME_DEV_STATIC bool "Use static /dev" + depends on !ADK_RUNTIME_INIT_SYSTEMD endchoice diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 622a65363..7c25754d1 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -18,9 +18,18 @@ config ADK_KERNEL_INOTIFY_USER bool default y +config ADK_KERNEL_AUTOFS4_FS + bool + config ADK_KERNEL_DNOTIFY bool +config ADK_KERNEL_TMPFS_POSIX_ACL + bool + +config ADK_KERNEL_TMPFS_XATTR + bool + config ADK_KERNEL_EXPORTFS tristate diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index ad0e01819..e27ddb951 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -8,6 +8,27 @@ config ADK_KERNEL_EXPERIMENTAL config ADK_KERNEL_STAGING bool +config ADK_KERNEL_CGROUP_CPUACCT + bool + +config ADK_KERNEL_CGROUP_DEVICE + bool + +config ADK_KERNEL_CGROUP_SCHED + bool + +config ADK_KERNEL_CGROUPS + bool + +config ADK_KERNEL_NAMESPACES + bool + +config ADK_KERNEL_FHANDLE + bool + +config ADK_KERNEL_AUDIT + bool + config ADK_KERNEL_RESET_CONTROLLER bool diff --git a/target/linux/kernel.config b/target/linux/kernel.config index c32c4ce66..188bc89d1 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -26,3 +26,4 @@ CONFIG_DEVKMEM=y CONFIG_EXPERT=y CONFIG_MULTIUSER=y CONFIG_VDSO=y +CONFIG_ADVISE_SYSCALLS=y |