From 67c51a96e80bca4f5ec7647b9156c6125cffbe94 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 26 Jun 2020 15:52:09 +0200 Subject: [PATCH] Revert "profiles: force to use ssl USE flag for wget" This reverts commit 517e23ebfe96137f1482ae42f8b29fc2f1b31317. The new USE flag `ssl` for wget resulted in a strange issue. `wget` started to pull in `dev-libs/openssl`, which has `bindist` in its USE flag. The catalyst stages, however, need to install wget without `bindist`. Such mismatches resulted in errors like: ``` !!! All ebuilds that could satisfy "dev-libs/openssl:0=" for /tmp/stage1root/ have been masked. !!! One of the following masked packages is required to complete your request: - dev-libs/openssl-1.0.2u::coreos (masked by: bindist in RESTRICT) ``` So to fix the issue, what needs to be done is basically: ``` ACCEPT_RESTRICT=bindist USE=-bindist emerge -pv openssl openssh ``` Unfortunately it is not possible to set `accept_restrict` configs under the coreos-overlay repo. We need to have some time to investigate why it is so. As a hotfix, we need to revert the `ssl` USE flag for wget. --- .../coreos-overlay/profiles/coreos/arm64/package.use.force | 5 ----- .../coreos-overlay/profiles/coreos/base/package.use.force | 5 ----- 2 files changed, 10 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force index 782eff3ff2..1947a2fd59 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force @@ -1,7 +1,2 @@ sys-auth/polkit -introspection sys-apps/systemd -introspection - -# Matt Turner (2020-03-28) -# wget is the default FETCHCOMMAND, and most distfiles are distributed via -# HTTPS. Bug #611072 -net-misc/wget ssl 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 959a4c0225..b642673c60 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 @@ -3,8 +3,3 @@ # Do not force this flag, we don't need XATTR_PAX sys-apps/portage -xattr - -# Matt Turner (2020-03-28) -# wget is the default FETCHCOMMAND, and most distfiles are distributed via -# HTTPS. Bug #611072 -net-misc/wget ssl