From 158eb34f72340295e37256cb0dcfaac3ea2eca3d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 6 Jan 2022 13:23:39 +0100 Subject: [PATCH 1/5] profiles: Keep using crypt functionality from glibc --- .../coreos-overlay/profiles/coreos/base/package.mask | 7 +++++++ .../coreos-overlay/profiles/coreos/base/package.unmask | 7 +++++++ .../coreos-overlay/profiles/coreos/base/package.use.mask | 7 +++++++ 3 files changed, 21 insertions(+) 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 f1c25e8969..8b3218484c 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,3 +14,10 @@ # Since version 2, it tries to write liblto symlinks with absolute paths that # don't work when building for the board root directories. >=sys-devel/gcc-config-2 + +# 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. +>=virtual/libcrypt-2 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 dad5cf17a4..dbf41a9f24 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 @@ -5,3 +5,10 @@ # gentoo. We still need it, since sys-libs/libsemanage still requires # it. When we update selinux, this can be dropped. =dev-libs/ustr-1.0.4-r8 + +# 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. +=virtual/libcrypt-1-r1 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 a98fc7ad28..66df6be1ce 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 @@ -19,3 +19,10 @@ sys-libs/ncurses cxx # To fix that, exclude the unicode USE flag from packages.use.force list, # which is defined in portage-stable. app-editors/nano unicode + +# 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. +sys-libs/glibc -crypt From 752f695663514da8a40c70b205f38918c89f316c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 5 Jan 2022 19:36:12 +0100 Subject: [PATCH 2/5] sys-apps/portage: Drop support for uclibc It was removed from Gentoo and with updated profiles, the build started to fail with: USE flag 'elibc_uclibc' referenced in conditional 'elibc_uclibc?' is not in IUSE --- .../coreos-overlay/sys-apps/portage/portage-3.0.28-r1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r1.ebuild index f78e9c9a7c..b71e6e4a1e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r1.ebuild @@ -61,7 +61,6 @@ RDEPEND=" ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) - elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) From 1a35d9b996c72a9d4ec9426241e37ade8d5de6d7 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 6 Jan 2022 18:50:25 +0100 Subject: [PATCH 3/5] profiles: Drop sys-apps/hwids from accept_keywords We are replacing this package with sys-apps/hwdata. Also, no point in using unstable versions - they are stabilized quickly enough. --- .../profiles/features/systemd/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords index afa5c451ad..9809abddca 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords @@ -1,3 +1,2 @@ # Various dependencies that also need to be up-to-date -sys-apps/hwids ~amd64 ~x86 sys-apps/kmod ~amd64 ~x86 From 09465e5a67fa5bc40c158d268b28ee0e951f5734 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 6 Jan 2022 19:08:22 +0100 Subject: [PATCH 4/5] sys-apps/systemd: Sync hwdb bits with Gentoo Gentoo deprecated sys-apps/hwids and is going to drop it soon. --- .../sys-apps/systemd/systemd-9999.ebuild | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index d89acb289e..f5dc532b45 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" # Flatcar: Dropped static-libs, we don't care about static libraries. -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" REQUIRED_USE=" homed? ( cryptsetup pam ) @@ -115,6 +115,7 @@ RDEPEND="${COMMON_DEPEND} sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev @@ -124,7 +125,6 @@ RDEPEND="${COMMON_DEPEND} # # Flatcar: We don't have sys-fs/udev-init-scripts-34, so it's dropped. PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( sys-apps/hwids[systemd(+),udev] ) policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" @@ -282,7 +282,6 @@ multilib_src_configure() { -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" $(meson_native_use_bool homed) - $(meson_native_use_bool hwdb) $(meson_native_use_bool http microhttpd) $(meson_native_use_bool idn) $(meson_native_use_bool importd) @@ -412,10 +411,6 @@ multilib_src_install_all() { # Flatcar: TODO: Consider using that instead of # dotmpfiles "${FILESDIR}"/systemd-flatcar.conf below. - if use hwdb; then - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die - fi - if use split-usr; then # Avoid breaking boot/reboot dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd @@ -585,9 +580,7 @@ pkg_postinst() { # Keep this here in case the database format changes so it gets updated # when required. - if use hwdb; then - systemd-hwdb --root="${ROOT}" update - fi + systemd-hwdb --root="${ROOT}" update udev_reload || FAIL=1 From db5f1c7e72d54fecb97f582f712056360f4996d8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 7 Jan 2022 07:55:50 +0100 Subject: [PATCH 5/5] *: Drop mentions of elibc_FreeBSD --- .../coreos-overlay/sys-libs/ldb/ldb-2.3.0-r2.ebuild | 1 - .../sys-libs/timezone-data/timezone-data-2019b-r2.ebuild | 4 ++-- .../sys-libs/timezone-data/timezone-data-2019c.ebuild | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r2.ebuild index e8c1dbdf17..adb1021014 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r2.ebuild @@ -22,7 +22,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild index 7d7b49503a..7b0606faa5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t LICENSE="BSD public-domain" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="nls leaps-timezone elibc_FreeBSD" +IUSE="nls leaps-timezone" DEPEND="nls? ( virtual/libintl )" RDEPEND="${DEPEND} @@ -38,7 +38,7 @@ src_configure() { append-lfs-flags #471102 - if use elibc_FreeBSD || use elibc_Darwin ; then + if use elibc_Darwin ; then append-cppflags -DSTD_INSPIRED #138251 fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019c.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019c.ebuild index 23d0d25f0b..736b9888a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019c.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019c.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t LICENSE="BSD public-domain" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="nls leaps-timezone elibc_FreeBSD" +IUSE="nls leaps-timezone" DEPEND="nls? ( virtual/libintl )" RDEPEND="${DEPEND} @@ -38,7 +38,7 @@ src_configure() { append-lfs-flags #471102 - if use elibc_FreeBSD || use elibc_Darwin ; then + if use elibc_Darwin ; then append-cppflags -DSTD_INSPIRED #138251 fi