overlay profiles: Switch to Gentoo's systemd profiles

flatcar · Sep 5, 2024 · 6225e8f · 6225e8f
1 parent 8295386
commit 6225e8f
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 31 deletions.
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
@@ -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
@@ -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
@@ -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
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
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
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
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
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
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
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