commit: 95351937678850ab86d4bd0f8819a80c594578d0
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 00:44:01 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 00:46:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95351937
sys-apps/systemd: skip DEVPTS_MULTIPLE_INSTANCES check for Linux >= 4.7
Thanks to novns in #gentoo-systemd.
sys-apps/systemd/systemd-226-r2.ebuild | 3 ++-
sys-apps/systemd/systemd-228-r1.ebuild | 3 ++-
sys-apps/systemd/systemd-229.ebuild | 3 ++-
sys-apps/systemd/systemd-230-r2.ebuild | 3 ++-
sys-apps/systemd/systemd-231.ebuild | 3 ++-
sys-apps/systemd/systemd-9999.ebuild | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/sys-apps/systemd/systemd-226-r2.ebuild
b/sys-apps/systemd/systemd-226-r2.ebuild
index 0667f52..02ffcf5 100644
--- a/sys-apps/systemd/systemd-226-r2.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEPEND}
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY
~FHANDLE
+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD
~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE
~!SYSFS_DEPRECATED
@@ -104,6 +104,7 @@ pkg_pretend() {
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
if linux_config_exists; then
local uevent_helper_path=$(linux_chkconfig_string
UEVENT_HELPER_PATH)
diff --git a/sys-apps/systemd/systemd-228-r1.ebuild
b/sys-apps/systemd/systemd-228-r1.ebuild
index 35265a0..d64cd19 100644
--- a/sys-apps/systemd/systemd-228-r1.ebuild
+++ b/sys-apps/systemd/systemd-228-r1.ebuild
@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEPEND}
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY
~FHANDLE
+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD
~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE
~!SYSFS_DEPRECATED
@@ -104,6 +104,7 @@ pkg_pretend() {
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
if linux_config_exists; then
local uevent_helper_path=$(linux_chkconfig_string
UEVENT_HELPER_PATH)
diff --git a/sys-apps/systemd/systemd-229.ebuild
b/sys-apps/systemd/systemd-229.ebuild
index 580e12e..de87dcc 100644
--- a/sys-apps/systemd/systemd-229.ebuild
+++ b/sys-apps/systemd/systemd-229.ebuild
@@ -100,7 +100,7 @@ DEPEND="${COMMON_DEPEND}
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY
~FHANDLE
+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD
~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE
~!SYSFS_DEPRECATED
@@ -108,6 +108,7 @@ pkg_pretend() {
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
if linux_config_exists; then
local uevent_helper_path=$(linux_chkconfig_string
UEVENT_HELPER_PATH)
diff --git a/sys-apps/systemd/systemd-230-r2.ebuild
b/sys-apps/systemd/systemd-230-r2.ebuild
index ba272c4..97cfdce 100644
--- a/sys-apps/systemd/systemd-230-r2.ebuild
+++ b/sys-apps/systemd/systemd-230-r2.ebuild
@@ -106,7 +106,7 @@ python_check_deps() {
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY
~FHANDLE
+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD
~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE
~!SYSFS_DEPRECATED
@@ -114,6 +114,7 @@ pkg_pretend() {
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
if linux_config_exists; then
local uevent_helper_path=$(linux_chkconfig_string
UEVENT_HELPER_PATH)
diff --git a/sys-apps/systemd/systemd-231.ebuild
b/sys-apps/systemd/systemd-231.ebuild
index b4f2613..26e4eff 100644
--- a/sys-apps/systemd/systemd-231.ebuild
+++ b/sys-apps/systemd/systemd-231.ebuild
@@ -105,7 +105,7 @@ python_check_deps() {
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY
~FHANDLE
+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD
~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE
~!SYSFS_DEPRECATED
@@ -113,6 +113,7 @@ pkg_pretend() {
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
if linux_config_exists; then
local uevent_helper_path=$(linux_chkconfig_string
UEVENT_HELPER_PATH)
diff --git a/sys-apps/systemd/systemd-9999.ebuild
b/sys-apps/systemd/systemd-9999.ebuild
index b4f2613..26e4eff 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -105,7 +105,7 @@ python_check_deps() {
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY
~FHANDLE
+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD
~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE
~!SYSFS_DEPRECATED
@@ -113,6 +113,7 @@ pkg_pretend() {
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
if linux_config_exists; then
local uevent_helper_path=$(linux_chkconfig_string
UEVENT_HELPER_PATH)
