diff --git a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-5.1_p8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-5.1_p8.ebuild index 19bb8a51ad..818073754c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-5.1_p8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-5.1_p8.ebuild @@ -59,7 +59,7 @@ RDEPEND=" ${DEPEND} " # We only need yacc when the .y files get patched (bash42-005) -#BDEPEND="virtual/yacc" +#BDEPEND="app-alternatives/yacc" S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-crypt/mit-krb5 b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-crypt/mit-krb5 index 18e79e42f3..abb586975c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-crypt/mit-krb5 +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-crypt/mit-krb5 @@ -1,4 +1,10 @@ -# work around configure test that cannot be cross compiled :( +# Work around configure test that cannot be cross compiled :( +# +# When checking if this is still applicable, try grepping the +# configure script for lines with "$cross_compiling", like +# +# grep -B 20 -F 'when cross compiling' configure + export krb5_cv_attr_constructor_destructor=yes,yes export ac_cv_func_regcomp=yes export ac_cv_printf_positional=yes diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/README.md b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/README.md index 8b27d3d896..3e2e334d9a 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/README.md +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/README.md @@ -82,3 +82,6 @@ Modifications made: - Create versionless links (python and python3) to python executable. - Remove installed stuff in `/discard`. + +- Replace the dependency on `virtual/awk` with `app-alternatives/awk`. + The former is gone in favor of the latter. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-3.9.12.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-3.9.12.ebuild index 0cdb068420..2e4a1df3ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-3.9.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-3.9.12.ebuild @@ -43,7 +43,7 @@ DEPEND=" virtual/libintl " BDEPEND=" - virtual/awk + app-alternatives/awk virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( sec-keys/openpgp-keys-python ) diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.8.7.ebuild b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.8.7.ebuild index bcf9182795..69ab247e39 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.8.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.8.7.ebuild @@ -32,16 +32,19 @@ DEPEND="${COMMON_DEPEND} virtual/os-headers >=sys-kernel/linux-headers-4.4:0 " +# Flatcar: Rename virtual/yacc to app-alternatives/yacc. The former is +# gone in favor of the latter in Gentoo. This modification will be +# dropped when we update this ebuild from Gentoo. BDEPEND="${BUILD_DEPEND} app-eselect/eselect-iptables virtual/pkgconfig nftables? ( sys-devel/flex - virtual/yacc + app-alternatives/yacc ) " # Flatcar: Drop BUILD_DEPEND, as we would not like to ship -# eselect in the final image. Also, drop net-firewall/arptables as we don't +# eselect in the final image. Also, drop net-firewall/arptables as we don't # ship arptables RDEPEND="${COMMON_DEPEND} nftables? ( net-misc/ethertypes ) @@ -140,7 +143,7 @@ src_install() { } pkg_postinst() { - # Flatcar: Use xtables-nft-multi to use the nft backend instead of legacy backend + # Flatcar: Use xtables-nft-multi to use the nft backend instead of legacy backend local default_iptables="xtables-nft-multi" if ! eselect iptables show &>/dev/null; then elog "Current iptables implementation is unset, setting to ${default_iptables}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index e96fa19be4..6d9a8d9d1c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -23,3 +23,6 @@ app-editors/nano unicode # libxcrypt -> glibc -> python), and also we need to update gcc to # version 10 or later. sys-libs/glibc -crypt + +# We don't use pip. +dev-lang/python ensurepip diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-11.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-11.2.ebuild index 0130f4967b..242e651039 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-11.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/gdb/gdb-11.2.ebuild @@ -87,7 +87,7 @@ DEPEND="${RDEPEND}" BDEPEND=" app-arch/xz-utils sys-apps/texinfo - virtual/yacc + app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu ) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.35-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.35-r8.ebuild index f7eb387963..19c1440db7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.35-r8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.35-r8.ebuild @@ -110,7 +110,7 @@ BDEPEND=" !compile-locales? ( app-arch/gzip sys-apps/grep - virtual/awk + app-alternatives/awk ) " COMMON_DEPEND=" @@ -127,14 +127,14 @@ DEPEND="${COMMON_DEPEND} compile-locales? ( app-arch/gzip sys-apps/grep - virtual/awk + app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) " RDEPEND="${COMMON_DEPEND} app-arch/gzip sys-apps/grep - virtual/awk + app-alternatives/awk sys-apps/gentoo-functions !