From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E71F9139082 for ; Mon, 27 Nov 2017 22:04:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FD7DE0ECB; Mon, 27 Nov 2017 22:04:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E38BBE0ECB for ; Mon, 27 Nov 2017 22:04:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 881A733BEAC for ; Mon, 27 Nov 2017 22:04:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B989A9BF for ; Mon, 27 Nov 2017 22:04:03 +0000 (UTC) From: "Mike Gilbert" 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" Message-ID: <1511820239.663c5cf752b24425fa93c8f9a0fbf22077314520.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-235-r1.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: 663c5cf752b24425fa93c8f9a0fbf22077314520 X-VCS-Branch: master Date: Mon, 27 Nov 2017 22:04:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fb907213-5833-48ae-8eaa-89a3ac759395 X-Archives-Hash: 6443d890b704262cc0a0312ede912e1e commit: 663c5cf752b24425fa93c8f9a0fbf22077314520 Author: Mike Gilbert gentoo org> AuthorDate: Mon Nov 27 22:03:07 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Nov 27 22:03:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663c5cf7 sys-apps/systemd: add kernel check for CGROUP_BPF Closes: https://bugs.gentoo.org/638860 Package-Manager: Portage-2.3.15, Repoman-2.3.6_p7 sys-apps/systemd/systemd-235-r1.ebuild | 1 + sys-apps/systemd/systemd-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild index e31cdbf1487..a83897f709f 100644 --- a/sys-apps/systemd/systemd-235-r1.ebuild +++ b/sys-apps/systemd/systemd-235-r1.ebuild @@ -118,6 +118,7 @@ pkg_pretend() { use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" + kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" 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 032a4e3441e..e32db7f2190 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -116,6 +116,7 @@ pkg_pretend() { use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" + kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" if linux_config_exists; then local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)