projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba61a75)
sys-apps/systemd: skip DEVPTS_MULTIPLE_INSTANCES check for Linux >= 4.7
authorMike Gilbert <floppym@gentoo.org>
Sun, 31 Jul 2016 00:44:01 +0000 (20:44 -0400)
committerMike Gilbert <floppym@gentoo.org>
Sun, 31 Jul 2016 00:46:02 +0000 (20:46 -0400)
Thanks to novns in #gentoo-systemd.

sys-apps/systemd/systemd-226-r2.ebuild patch | blob | history
sys-apps/systemd/systemd-228-r1.ebuild patch | blob | history
sys-apps/systemd/systemd-229.ebuild patch | blob | history
sys-apps/systemd/systemd-230-r2.ebuild patch | blob | history
sys-apps/systemd/systemd-231.ebuild patch | blob | history
sys-apps/systemd/systemd-9999.ebuild patch | blob | history

diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild
index 0667f523c5b8aa54733fd5fd8789a9ef37806c15..02ffcf5da3e324edd3026fcd57a56f10982c92c9 100644 (file)
--- 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 35265a0149c56a054b22feb116c90627bb29d0f9..d64cd1995078b83b1b13ac7c19ed49a725e33e76 100644 (file)
--- 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 580e12e194677c57bae495592cc930f7c307d814..de87dcccfcf578a3c50e0f70cc3e9a8c89022698 100644 (file)
--- 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 ba272c443dae6e2212b1a3db47e9d45e33b0cf56..97cfdce6c224ad4c1ce5dedbd067fb9a1c097910 100644 (file)
--- 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 b4f261317768f49e1bd2f04ec5ccc3817dc9cd5a..26e4effa92280c954a2fd375ffd210a8cbe9eb3d 100644 (file)
--- 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 b4f261317768f49e1bd2f04ec5ccc3817dc9cd5a..26e4effa92280c954a2fd375ffd210a8cbe9eb3d 100644 (file)
--- 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)
Unnamed repository; edit this file 'description' to name the repository.