From 3b29f965e28489cca1a2b3c8fad9caa01430a5b4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 3 Jan 2023 13:03:15 +0100 Subject: [PATCH] profiles: Cleanups for systemd Sort the use flags, drop obsolete ones and nonexistent packages, drop unnecessary accept keywords file (as it would potentially introduce a version mismatch between amd64 and arm64). --- .../coreos-overlay/profiles/coreos/base/package.use | 4 ++-- .../profiles/coreos/targets/generic/package.use | 2 +- .../profiles/features/systemd/package.accept_keywords | 2 -- .../coreos-overlay/profiles/features/systemd/package.unmask | 1 - .../profiles/features/systemd/package.use.force | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 898f2b7f96..7984f1d946 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -29,9 +29,9 @@ net-analyzer/nmap ncat -system-lua symlink # removes mta dependencies app-admin/sudo -sendmail -# use lzma which is the default on non-gentoo systems, enable selinux, # disable hybrid cgroup as we use the unified mode now -sys-apps/systemd build curl idn lzma selinux -cgroup-hybrid +# use lzma which is the default on non-gentoo systems, enable selinux, +sys-apps/systemd -cgroup-hybrid curl idn lzma selinux net-libs/libmicrohttpd -ssl # disable kernel config detection and module building diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index e32127fa26..1154ac8dc0 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -20,7 +20,7 @@ sys-libs/ncurses minimal sys-libs/pam audit # enable journal gateway, bootctl and container features -sys-apps/systemd audit gnuefi importd http iptables +sys-apps/systemd audit gnuefi http importd iptables # epoll is needed for systemd-journal-remote to work. coreos/bugs#919 net-libs/libmicrohttpd epoll diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords deleted file mode 100644 index 9809abddca..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords +++ /dev/null @@ -1,2 +0,0 @@ -# Various dependencies that also need to be up-to-date -sys-apps/kmod ~amd64 ~x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask index e4813f3969..9b52e5deb1 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask @@ -1,2 +1 @@ sys-apps/systemd -sys-apps/systemd-ui diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force index 0b09521feb..0b373328b3 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force @@ -1,8 +1,8 @@ # Copyright (c) 2014 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# disable gentoo-only bits and replace sysvinit -sys-apps/systemd vanilla sysv-utils +# replace sysvinit and disable gentoo-only bits +sys-apps/systemd sysv-utils vanilla # dbus without systemd conflicts with systemd sys-apps/dbus systemd