[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     9818df809dbb68cbf047222110bba8f6f62c47d0
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 20:13:40 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 20:13:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9818df80

sys-apps/systemd: make CONFIG_KCMP check version-specific

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/systemd-249.4-r4.ebuild | 8 +++++++-
 sys-apps/systemd/systemd-249.6.ebuild    | 8 +++++++-
 sys-apps/systemd/systemd-9999.ebuild     | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sys-apps/systemd/systemd-249.4-r4.ebuild 
b/sys-apps/systemd/systemd-249.4-r4.ebuild
index 01503d4fcf00..722d9f6b3f04 100644
--- a/sys-apps/systemd/systemd-249.4-r4.ebuild
+++ b/sys-apps/systemd/systemd-249.4-r4.ebuild
@@ -177,7 +177,7 @@ pkg_pretend() {
                fi
 
                local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-                       ~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+                       ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD 
~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
@@ -190,6 +190,12 @@ pkg_pretend() {
                kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
                kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
+               if kernel_is -lt 5 10 20; then
+                       CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+               else
+                       CONFIG_CHECK+=" ~KCMP"
+               fi
+
                if linux_config_exists; then
                        local uevent_helper_path=$(linux_chkconfig_string 
UEVENT_HELPER_PATH)
                        if [[ -n ${uevent_helper_path} ]] && [[ 
${uevent_helper_path} != '""' ]]; then

diff --git a/sys-apps/systemd/systemd-249.6.ebuild 
b/sys-apps/systemd/systemd-249.6.ebuild
index 1370a0cb30e6..6671b0b73702 100644
--- a/sys-apps/systemd/systemd-249.6.ebuild
+++ b/sys-apps/systemd/systemd-249.6.ebuild
@@ -177,7 +177,7 @@ pkg_pretend() {
                fi
 
                local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-                       ~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+                       ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD 
~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
@@ -190,6 +190,12 @@ pkg_pretend() {
                kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
                kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
+               if kernel_is -lt 5 10 20; then
+                       CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+               else
+                       CONFIG_CHECK+=" ~KCMP"
+               fi
+
                if linux_config_exists; then
                        local uevent_helper_path=$(linux_chkconfig_string 
UEVENT_HELPER_PATH)
                        if [[ -n ${uevent_helper_path} ]] && [[ 
${uevent_helper_path} != '""' ]]; then

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 485b6498181e..9283d37090fb 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -182,7 +182,7 @@ pkg_pretend() {
                fi
 
                local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-                       ~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+                       ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD 
~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
@@ -195,6 +195,12 @@ pkg_pretend() {
                kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
                kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
+               if kernel_is -lt 5 10 20; then
+                       CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+               else
+                       CONFIG_CHECK+=" ~KCMP"
+               fi
+
                if linux_config_exists; then
                        local uevent_helper_path=$(linux_chkconfig_string 
UEVENT_HELPER_PATH)
                        if [[ -n ${uevent_helper_path} ]] && [[ 
${uevent_helper_path} != '""' ]]; then