From c12850f476dbc718f435ec4a8388ff7b0442e721 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 25 Jan 2023 16:29:36 +0100 Subject: [PATCH] profiles: Pick defaults for app-alternatives during bootstrap. --- .../profiles/coreos/base/make.defaults | 5 ----- .../profiles/coreos/base/package.use.force | 12 ++++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index f379b12095..f390955959 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -46,11 +46,6 @@ BOOTSTRAP_USE="${BOOTSTRAP_USE} curl_ssl_openssl ssl" # Add `xml` USE flag to avoid build failures from sys-apps/portage 3.0.28 BOOTSTRAP_USE="${BOOTSTRAP_USE} xml" -# Add `bison` USE flag, so we pick a proper yacc alternative from -# app-alternatives/yacc (normally bison is enabled by default, but -# it's disabled during building stage2 for some reason). -BOOTSTRAP_USE="${BOOTSTRAP_USE} bison" - # Set SELinux policy POLICY_TYPES="targeted mcs mls" 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 1ce186e069..d44b8dc8ff 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 @@ -1,6 +1,18 @@ # Copyright (c) 2014 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 +# Force enable those USE flags, so they are picked up also during +# bootstrap, where normally all USE flags are cleared. +app-alternatives/awk gawk +app-alternatives/bc gnu +app-alternatives/bzip2 reference +app-alternatives/cpio gnu +app-alternatives/gzip reference +app-alternatives/lex flex +app-alternatives/sh bash +app-alternatives/tar gnu +app-alternatives/yacc bison + # Force libcrypt so it's included in stage-1 of the SDK build. # +crypt was introduced in glibc-2.30 and above. sys-libs/glibc crypt