From b3f1c26c84abd72ada43aede1482bea4f100491c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 13 Jun 2023 10:05:12 +0200 Subject: [PATCH] overlay profiles: Update some comments --- .../coreos-overlay/profiles/coreos/base/package.mask | 5 ++--- .../coreos-overlay/profiles/coreos/base/package.unmask | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index d1c5bff76f..04124822ce 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -14,10 +14,9 @@ # Overwrite portage-stable mask. We are delaying the transition to # libxcrypt, because we need to figure out how to solve the dep loop # that results from the migration (python -> virtual/libcrypt -> -# libxcrypt -> glibc -> python), and also we need to update gcc to -# version 10 or later. +# libxcrypt -> glibc -> python). >=virtual/libcrypt-2 # Python 3.11 is stable in portage-stable, so avoid picking it -# up. Drop this when we switch to it. +# up. Update this to mask later versions when we switch to 3.11. >=dev-lang/python-3.11 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask index 0463755f1b..281988a591 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask @@ -1,8 +1,7 @@ # Overwrite portage-stable mask. We are delaying the transition to # libxcrypt, because we need to figure out how to solve the dep loop # that results from the migration (python -> virtual/libcrypt -> -# libxcrypt -> glibc -> python), and also we need to update gcc to -# version 10 or later. +# libxcrypt -> glibc -> python). =virtual/libcrypt-1-r1 # Overwrite portage-stable mask. OpenSSL-3* is building fine on Flatcar