diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2016-04-22 14:05:58 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2016-04-22 14:05:58 -0400 |
| commit | 53f63e4e0ebb503d06ae47030b9d66e1208de0e2 (patch) | |
| tree | 1d97cfbaaceaae762a042a52ac84fcaa507fb668 | |
| parent | Linux patch 4.1.22 (diff) | |
| download | linux-patches-53f63e4e0ebb503d06ae47030b9d66e1208de0e2.tar.gz linux-patches-53f63e4e0ebb503d06ae47030b9d66e1208de0e2.tar.bz2 linux-patches-53f63e4e0ebb503d06ae47030b9d66e1208de0e2.zip | |
Update for Gentoo specific distro patch. Select DEVPTS_MULTIPLE_INSTANCES when GENTOO_LINUX_INIT_SYSTEMD selected. Bug #579424.
| -rw-r--r-- | 4567_distro-Gentoo-Kconfig.patch | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch index 652e2a7a..c7af596c 100644 --- a/4567_distro-Gentoo-Kconfig.patch +++ b/4567_distro-Gentoo-Kconfig.patch @@ -1,5 +1,5 @@ ---- a/Kconfig 2014-04-02 09:45:05.389224541 -0400 -+++ b/Kconfig 2014-04-02 09:45:39.269224273 -0400 +--- a/Kconfig ++++ b/Kconfig @@ -8,4 +8,6 @@ config SRCARCH string option env="SRCARCH" @@ -7,9 +7,9 @@ +source "distro/Kconfig" + source "arch/$SRCARCH/Kconfig" ---- 1969-12-31 19:00:00.000000000 -0500 -+++ b/distro/Kconfig 2014-04-02 09:57:03.539218861 -0400 -@@ -0,0 +1,108 @@ +--- /dev/null ++++ b/distro/Kconfig +@@ -0,0 +1,131 @@ +menu "Gentoo Linux" + +config GENTOO_LINUX @@ -30,7 +30,7 @@ + + depends on GENTOO_LINUX + default y if GENTOO_LINUX -+ ++ + select DEVTMPFS + select TMPFS + @@ -51,7 +51,29 @@ + boot process; if not available, it causes sysfs and udev to malfunction. + + To ensure Gentoo Linux boots, it is best to leave this setting enabled; -+ if you run a custom setup, you could consider whether to disable this. ++ if you run a custom setup, you could consider whether to disable this. ++ ++config GENTOO_LINUX_PORTAGE ++ bool "Select options required by Portage features" ++ ++ depends on GENTOO_LINUX ++ default y if GENTOO_LINUX ++ ++ select CGROUPS ++ select NAMESPACES ++ select IPC_NS ++ select NET_NS ++ ++ help ++ This enables options required by various Portage FEATURES. ++ Currently this selects: ++ ++ CGROUPS (required for FEATURES=cgroup) ++ IPC_NS (required for FEATURES=ipc-sandbox) ++ NET_NS (required for FEATURES=network-sandbox) ++ ++ It is highly recommended that you leave this enabled as these FEATURES ++ are, or will soon be, enabled by default. + +menu "Support for init systems, system and service managers" + visible if GENTOO_LINUX @@ -87,12 +109,13 @@ + select AUTOFS4_FS + select BLK_DEV_BSG + select CGROUPS ++ select DEVPTS_MULTIPLE_INSTANCES + select EPOLL + select FANOTIFY + select FHANDLE + select INOTIFY_USER + select NET -+ select NET_NS ++ select NET_NS + select PROC_FS + select SIGNALFD + select SYSFS |