diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent index 83f8ac1d207..c51b3b68255 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent @@ -1,2 +1,2 @@ -portage-stable:default/linux/amd64/23.0/no-multilib/hardened +portage-stable:default/linux/amd64/23.0/no-multilib/hardened/systemd :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent index 49b7b70316a..f0a79704e37 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent @@ -1,2 +1,3 @@ portage-stable:default/linux/arm64/23.0/hardened +portage-stable:targets/systemd :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force index c538b7f58c6..afc4ecf8731 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force @@ -25,3 +25,6 @@ net-misc/curl ssl openssl curl_ssl_openssl # that cause the build in stage1 to fail. Pulling in asm too, as it is # required by cpudetection. dev-libs/gmp cpudetection asm + +# Disable gentoo-only bits. +sys-apps/systemd vanilla diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent deleted file mode 100644 index e00b432785f..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent +++ /dev/null @@ -1,2 +0,0 @@ -portage-stable:targets/systemd -:features/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults deleted file mode 100644 index ded4466d96d..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -USE="systemd udev" -BOOTSTRAP_USE="$BOOTSTRAP_USE udev" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask deleted file mode 100644 index 3123811515b..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask +++ /dev/null @@ -1,4 +0,0 @@ -# Mask sysvinit+openrc and runit+openrc in favor of systemd -sys-apps/sysvinit -sys-apps/openrc -sys-process/runit 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 deleted file mode 100644 index 9b52e5deb1c..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask +++ /dev/null @@ -1 +0,0 @@ -sys-apps/systemd 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 deleted file mode 100644 index 09272cb6394..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2014 The CoreOS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# replace sysvinit and disable gentoo-only bits -sys-apps/systemd sysv-utils vanilla - -# dbus without systemd conflicts with systemd -sys-apps/dbus systemd - -# use systemd as udev implementation -virtual/libudev systemd -virtual/udev systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages deleted file mode 100644 index 92783beb684..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages +++ /dev/null @@ -1,4 +0,0 @@ -# Add systemd to the 'system' set -*sys-apps/gentoo-functions -*sys-apps/systemd --*sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build deleted file mode 100644 index a3d7e98b94e..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build +++ /dev/null @@ -1,3 +0,0 @@ -sys-apps/dbus -sys-apps/gentoo-functions --sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask deleted file mode 100644 index 6259b323fc1..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask +++ /dev/null @@ -1,2 +0,0 @@ -openrc --systemd