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 b15d5c1cf9..83f8ac1d20 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/17.1/no-multilib/hardened +portage-stable:default/linux/amd64/23.0/no-multilib/hardened :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 ffc428f773..49b7b70316 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,2 @@ -portage-stable:default/linux/arm64/17.0/hardened +portage-stable:default/linux/arm64/23.0/hardened :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force deleted file mode 100644 index 506c18cf11..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force +++ /dev/null @@ -1,7 +0,0 @@ -# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base -# profile in portage-stable forces split-usr, so here we unforce it -# and in use.mask we mask it. -# -# TODO: Drop it when we move to -# default/linux/{amd64,arm64}/23.0/hardened/selinux/systemd profile --split-usr diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index 955ab8e276..726c8edc2e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -21,11 +21,3 @@ python_single_target_python3_13 # We don't care about i10n, takes too much space, pulls in too many # extra dependencies. nls - -# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base -# profile in portage-stable forces split-usr, so in use.force we -# unforce it and here we mask it. -# -# TODO: Drop it when we move to -# default/linux/{amd64,arm64}/23.0/hardened/selinux/systemd profile -split-usr