diff options
author | Mike Pagano <mpagano@gentoo.org> | 2016-11-25 18:24:25 -0500 |
---|---|---|
committer | Mike Pagano <mpagano@gentoo.org> | 2016-11-25 18:24:25 -0500 |
commit | 7e3b918aa46a1a6055e46189049d0abf292f3f33 (patch) | |
tree | 2963af37952181f387dbd60ed84919c2deeb2785 | |
parent | Linux patch 3.12.67 (diff) | |
download | linux-patches-7e3b918aa46a1a6055e46189049d0abf292f3f33.tar.gz linux-patches-7e3b918aa46a1a6055e46189049d0abf292f3f33.tar.bz2 linux-patches-7e3b918aa46a1a6055e46189049d0abf292f3f33.zip |
Update gentoo kconfig patch adding CHECKPOINT_RESTORE for GENTOO_LINUX_INIT_SYSTEMD. See bug #598623.
-rw-r--r-- | 4567_distro-Gentoo-Kconfig.patch | 49 |
1 files changed, 41 insertions, 8 deletions
diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch index 690454a5..acb09725 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 2016-07-01 19:22:17.117439707 -0400 ++++ b/Kconfig 2016-07-01 19:21:54.371440596 -0400 @@ -8,4 +8,6 @@ config SRCARCH string option env="SRCARCH" @@ -7,9 +7,9 @@ +source "distro/Kconfig" + source "arch/$SRCARCH/Kconfig" ---- a/distro/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ b/distro/Kconfig 2015-01-02 13:54:45.589830665 -0500 -@@ -0,0 +1,109 @@ +--- /dev/null 2016-11-15 00:56:18.320838834 -0500 ++++ b/distro/Kconfig 2016-11-16 06:24:29.457357409 -0500 +@@ -0,0 +1,142 @@ +menu "Gentoo Linux" + +config GENTOO_LINUX @@ -30,9 +30,10 @@ + + depends on GENTOO_LINUX + default y if GENTOO_LINUX -+ ++ + select DEVTMPFS + select TMPFS ++ select UNIX + + select MMU + select SHMEM @@ -51,7 +52,32 @@ + 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 ++ select SYSVIPC ++ ++ 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) ++ SYSVIPC (required by IPC_NS) ++ ++ ++ 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,17 +113,24 @@ + select AUTOFS4_FS + select BLK_DEV_BSG + select CGROUPS ++ select CHECKPOINT_RESTORE + select DEVPTS_MULTIPLE_INSTANCES ++ select DMIID + select EPOLL + select FANOTIFY + select FHANDLE + select INOTIFY_USER ++ select IPV6 + select NET -+ select NET_NS ++ select NET_NS + select PROC_FS ++ select SECCOMP ++ select SECCOMP_FILTER + select SIGNALFD + select SYSFS + select TIMERFD ++ select TMPFS_POSIX_ACL ++ select TMPFS_XATTR + + select ANON_INODES + select BLOCK |