From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1341702-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DADCC158086
for <garchives@archives.gentoo.org>; Sat, 20 Nov 2021 20:14:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D274EE03DF;
Sat, 20 Nov 2021 20:14:48 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E86A4E03DF
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Nov 2021 20:14:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 28BC03431B4
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Nov 2021 20:14:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 93BA11B8
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Nov 2021 20:14:44 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1637439220.9818df809dbb68cbf047222110bba8f6f62c47d0.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/systemd/systemd-249.4-r4.ebuild sys-apps/systemd/systemd-249.6.ebuild sys-apps/systemd/systemd-9999.ebuild
X-VCS-Directories: sys-apps/systemd/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 9818df809dbb68cbf047222110bba8f6f62c47d0
X-VCS-Branch: master
Date: Sat, 20 Nov 2021 20:14:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4a4dfd17-75b9-4fc4-8836-ac4128d7af62
X-Archives-Hash: ecfd1e72bf39f0b255f4e360ba205f8b
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